From ccfc469d4c1057acf75a33a145ab252bb969b343 Mon Sep 17 00:00:00 2001
From: Silvio Fricke
Date: Tue, 6 Apr 2021 16:17:33 +0200
Subject: make: use VERSION number to tag the resulting image

fixes: #19

Signed-off-by: Silvio Fricke <silvio.fricke@softing.com>
---
 .travis.yml      |  2 ++
 Dockerfile       |  4 +++-
 Makefile         | 13 ++++++++++++-
 Makefile.version |  2 ++
 4 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 Makefile.version

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:
diff --git a/Dockerfile b/Dockerfile
index 03de3a8..f2a69c4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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
diff --git a/Makefile b/Makefile
index a0ad66c..c076c29 100644
--- a/Makefile
+++ b/Makefile
@@ -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)
-- 
cgit v1.2.3