[cpp-linbuild] 20/25: Rename and parameterize default image tag

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository cpp-linbuild.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-linbuild.git;a=commit;h=ad1b186963a2dd6b6cdd0345f6b4f9d7636f417f

commit ad1b186963a2dd6b6cdd0345f6b4f9d7636f417f
Author: John W. O'Brien <john at saltant.com>
AuthorDate: Sun Feb 28 22:12:40 2021 +0000

    Rename and parameterize default image tag
---
 Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index c47378c..a34ed65 100644
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,8 @@ DEFAULT_DIST_EXT=tar.bz2
 SOURCEDIR=$(srcdir)common/SOURCES
 SPECDIR=$(srcdir)common/SPECS
 
+BASETAG=base
+
 
 # All components
 
@@ -178,7 +180,7 @@ $(foreach platform,$(PLATFORMS),$(foreach component,$(COMPONENTS),$(eval $(call
 define build-docker-image-platform
 $(1)_token = $$(srcdir).$(1)_image
 $$($(1)_token): $(srcdir)os/$(1)/image/Dockerfile
-	docker build -t shibboleth/$(1):latest $(srcdir)os/$(1)/image
+	docker build -t shibboleth/$(1):$(BASETAG) $(srcdir)os/$(1)/image
 	touch $$($(1)_token)
 $(1)-image: $$($(1)_token)
 endef
@@ -198,7 +200,7 @@ $$($(1)_$(2)_token): $$($(2)_token) $(SOURCEDIR)/$$($(1)_DISTFILE) $(SPECDIR)/$$
 	docker run -it --rm \
 		--mount type=bind,source=$(srcdir)os/$(2)/products,target=/opt/build/external/out \
 		--mount type=bind,source=$(srcdir)common,target=/opt/build/external/in \
-		shibboleth/$(2):latest \
+		shibboleth/$(2):$(BASETAG) \
 		/bin/sh /opt/build/build-$($(1)_COMPNAME).sh
 	touch $$($(1)_$(2)_token)
 $$($(1)_COMPNAME)_$(2): $$($(1)_$(2)_token)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.