From 12e2e0292534b48840bcb110897256c12d8117f3 Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@kanboard.net>
Date: Fri, 21 Jun 2019 21:01:43 -0700
Subject: Tweak Docker manifest

---
 .dockerignore | 1 +
 Makefile      | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index e17c9e33..78631770 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -17,6 +17,7 @@ tests
 ChangeLog
 composer.json
 Dockerfile
+Dockerfile.*
 Makefile
 package.json
 Vagrantfile
diff --git a/Makefile b/Makefile
index 92e1224d..2fe7b21f 100644
--- a/Makefile
+++ b/Makefile
@@ -82,10 +82,10 @@ docker-image:
 
 docker-manifest:
 	for version in $(VERSION) latest; do \
-		docker build --build-arg VERSION=$${version} -t $(DOCKER_IMAGE):amd64-$${version} -f Dockerfile . && \
-		docker build --build-arg VERSION=$${version} -t $(DOCKER_IMAGE):arm32v6-$${version} -f Dockerfile.arm32v6 . && \
-		docker build --build-arg VERSION=$${version} -t $(DOCKER_IMAGE):arm32v7-$${version} -f Dockerfile.arm32v7 . && \
-		docker build --build-arg VERSION=$${version} -t $(DOCKER_IMAGE):arm64v8-$${version} -f Dockerfile.arm64v8 . && \
+		docker build --build-arg VERSION=$(VERSION) -t $(DOCKER_IMAGE):amd64-$${version} -f Dockerfile . && \
+		docker build --build-arg VERSION=$(VERSION) -t $(DOCKER_IMAGE):arm32v6-$${version} -f Dockerfile.arm32v6 . && \
+		docker build --build-arg VERSION=$(VERSION) -t $(DOCKER_IMAGE):arm32v7-$${version} -f Dockerfile.arm32v7 . && \
+		docker build --build-arg VERSION=$(VERSION) -t $(DOCKER_IMAGE):arm64v8-$${version} -f Dockerfile.arm64v8 . && \
 		docker push $(DOCKER_IMAGE):amd64-$${version} && \
 		docker push $(DOCKER_IMAGE):arm32v6-$${version} && \
 		docker push $(DOCKER_IMAGE):arm32v7-$${version} && \
-- 
cgit v1.2.3