From d6055f3363406262ead34ba7358b35c8a4f313e2 Mon Sep 17 00:00:00 2001
From: MisguidedEmails <34784422+MisguidedEmails@users.noreply.github.com>
Date: Wed, 16 Oct 2019 15:50:01 +0100
Subject: [PATCH] Add major.minor tagging to docker images (#229)

---
 Makefile | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 9f4f62a..a9ca0d4 100644
--- a/Makefile
+++ b/Makefile
@@ -73,12 +73,20 @@ package-zip: extract-licenses
 
 build-docker-amd64: require-version
 	cp ${BUILD_DIR}/gotify-linux-amd64 ./docker/gotify-app
-	(cd ${DOCKER_DIR} && docker build -t gotify/server:latest -t gotify/server:${VERSION} .)
+	cd ${DOCKER_DIR} && \
+		docker build \
+		-t gotify/server:latest \
+		-t gotify/server:${VERSION} \
+		-t gotify/server:$(shell echo $(VERSION) | cut -d '.' -f -2) .
 	rm ${DOCKER_DIR}gotify-app
 
 build-docker-arm-7: require-version
 	cp ${BUILD_DIR}/gotify-linux-arm-7 ./docker/gotify-app
-	(cd ${DOCKER_DIR} && docker build -f Dockerfile.armv7 -t gotify/server-arm7:latest -t gotify/server-arm7:${VERSION} .)
+	cd ${DOCKER_DIR} && \
+		docker build -f Dockerfile.armv7 \
+		-t gotify/server-arm7:latest \
+		-t gotify/server-arm7:${VERSION} \
+		-t gotify/server-arm7:$(shell echo $(VERSION) | cut -d '.' -f -2) .
 	rm ${DOCKER_DIR}gotify-app
 
 build-docker: build-docker-amd64 build-docker-arm-7