From a9274fe92e2dbeadc81cf40a3e5734bcfc8f32e6 Mon Sep 17 00:00:00 2001
From: Christian Segundo
Date: Tue, 12 Sep 2023 19:20:38 +0200
Subject: bump to 6.2

---
 Makefile | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index d77fef4..690c0ab 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,9 @@
-LANGUAGETOOL_VERSION := 6.1
-TRIVY_VERSION := 0.24.2
+LANGUAGETOOL_VERSION := 6.2
 
 BUILDARG_VERSION := --build-arg VERSION=$(LANGUAGETOOL_VERSION)
 IMAGENAME := docker.io/chn2guevara/languagetool
 BUILDARG_PLATFORM := --platform linux/amd64,linux/arm64/v8
-DOCKER_EXTRA_ARGS := 
+DOCKER_EXTRA_ARGS :=
 
 ci-deps:
 	apt-get -qq -y install \
@@ -29,16 +28,12 @@ ci-deps-docker:
 		docker-ce-cli \
 		containerd.io
 
-ci-deps-trivy:
-	wget https://github.com/aquasecurity/trivy/releases/download/v$(TRIVY_VERSION)/trivy_$(TRIVY_VERSION)_Linux-64bit.deb && \
-	dpkg -i trivy_$(TRIVY_VERSION)_Linux-64bit.deb
-
 ci-setup-buildx:
 	docker run --privileged --rm tonistiigi/binfmt --install all
 	-docker buildx create --name mybuilder
 	docker buildx use mybuilder
 
-ci-prepare: ci-deps ci-deps-docker ci-deps-trivy ci-setup-buildx
+ci-prepare: ci-deps ci-deps-docker ci-setup-buildx
 
 build: ci-prepare
 	docker buildx build $(BUILDARG_VERSION) $(BUILDARG_PLATFORM) -t $(IMAGENAME):latest .
@@ -46,13 +41,7 @@ build: ci-prepare
 
 push: ci-prepare
 	docker buildx build $(BUILDARG_VERSION) $(BUILDARG_PLATFORM) -t $(IMAGENAME):latest . --push
-  docker buildx build $(BUILDARG_VERSION) $(BUILDARG_PLATFORM) -t $(IMAGENAME):$(LANGUAGETOOL_VERSION) . --push
-
-trivy:
-	trivy i \
-		--ignore-unfixed \
-		--exit-code 1 \
-		$(IMAGENAME):latest
+	docker buildx build $(BUILDARG_VERSION) $(BUILDARG_PLATFORM) -t $(IMAGENAME):$(LANGUAGETOOL_VERSION) . --push
 
 test: build test-int
 
-- 
cgit v1.2.3