diff options
| author | Silvio Fricke | 2021-04-06 16:17:33 +0200 |
|---|---|---|
| committer | Silvio Fricke | 2021-04-06 16:31:05 +0200 |
| commit | ccfc469d4c1057acf75a33a145ab252bb969b343 (patch) | |
| tree | d8f1efcc393c5b4bfa020f8e4a261e1c4dce970b | |
| parent | dcee10fd9a2c26e49b740e9fde26654e47a2020a (diff) | |
| download | languagetool-ccfc469d4c1057acf75a33a145ab252bb969b343.tar.gz | |
make: use VERSION number to tag the resulting image
fixes: #19
Signed-off-by: Silvio Fricke <silvio.fricke@softing.com>
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | Dockerfile | 4 | ||||
| -rw-r--r-- | Makefile | 13 | ||||
| -rw-r--r-- | Makefile.version | 2 |
4 files changed, 19 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 17c74d1..5abbf7b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,8 @@ before_install: script: - make test +after_success: + - make tag notifications: email: @@ -1,10 +1,12 @@ FROM openjdk:14-alpine +# see Makefile.version +ARG VERSION + MAINTAINER Silvio Fricke <silvio.fricke@gmail.com> RUN apk add --no-cache libgomp gcompat libstdc++ -ENV VERSION 5.3 RUN wget https://www.languagetool.org/download/LanguageTool-$VERSION.zip && \ unzip LanguageTool-$VERSION.zip && \ rm LanguageTool-$VERSION.zip @@ -1,9 +1,12 @@ +include Makefile.version + prepare: sudo apt-get -qq -y install curl build: - docker build -t silvio/docker-languagetool . + docker build $(BUILDARG_VERSION) -t silvio/docker-languagetool:latest . + docker tag silvio/docker-languagetool:latest silvio/docker-languagetool:$(VERSION) test: test-cleanup.1 test: TESTIPADDRESS=$(subst ",,$(shell docker inspect languagetool | jq '.[0].NetworkSettings.IPAddress')) @@ -47,3 +50,11 @@ test-cleanup.%: -docker stop languagetool -docker rm languagetool +.PHONY: tag +tag: tag-push + +.PHONY: tag-push +tag-push: build +tag-push: + docker push silvio/docker-languagetool:latest + docker push silvio/docker-languagetool:$(VERSION) diff --git a/Makefile.version b/Makefile.version new file mode 100644 index 0000000..3696544 --- /dev/null +++ b/Makefile.version @@ -0,0 +1,2 @@ +VERSION := 5.3 +BUILDARG_VERSION := --build-arg VERSION=$(VERSION) |