aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorChristian Segundo2023-09-12 19:20:38 +0200
committerChristian Segundo2023-09-12 19:20:38 +0200
commita9274fe92e2dbeadc81cf40a3e5734bcfc8f32e6 (patch)
treeeafc9e8de30802f1f8e66da5f1ab1ec95da48ab0 /Makefile
parente75978e2a4e946a1d4ef462b254f5a891426f9e3 (diff)
downloadlanguagetool-a9274fe92e2dbeadc81cf40a3e5734bcfc8f32e6.tar.gz
bump to 6.26.2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile19
1 files changed, 4 insertions, 15 deletions
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