[cpp-linbuild] 07/07: SSPCPP-995 Fix interactive build container

[John W. O'Brien]

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

obrienjw 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=7cd658f41d619c12bd3bb12910d189265fe35d9e

commit 7cd658f41d619c12bd3bb12910d189265fe35d9e
Author: John W. O'Brien <john at saltant.com>
AuthorDate: Fri Dec 27 12:01:24 2024 -0500

    SSPCPP-995 Fix interactive build container
    
    I missed this when implementing the main, per-component removal in
    a7718f536404de902eeb634df70561da9e09e8c0
---
 Makefile | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 68dffc9..ce5719b 100644
--- a/Makefile
+++ b/Makefile
@@ -22,9 +22,8 @@
 #
 # <comp>_<plat>		Build component <comp> on platform <plat>
 #
-# run_container_<comp>_<plat>
-# 			Run an interactive build environment container
-# 			for component <comp> on platform <plat>
+# run_container_<plat>	Run an interactive build environment container
+# 			for platform <plat>
 #
 # Platform-specific notes:
 #
@@ -265,16 +264,16 @@ endef
 
 $(foreach platform,$(PLATFORMS),$(foreach component,$(COMPONENTS),$(eval $(call build-component-platform,$(component),$(platform)))))
 
-# Run an interactive build environment container for each component on each platform
-define run-container-component-platform
-.PHONY: run_container_$($(1)_COMPNAME)_$(2)
-run_container_$($(1)_COMPNAME)_$(2): $$($(1)_$(2)_image_token) $(SOURCEDIR)/$$($(1)_DISTFILE)
+# Run an interactive build environment container on each platform
+define run-container-platform
+.PHONY: run_container_$(1)
+run_container_$(1): $$($(1)_token) $(SOURCEDIR)/$$($(1)_DISTFILE)
 	docker run -it --rm \
-		-v $$($(2)_products):/opt/build/external/out:z \
+		-v $$($(1)_products):/opt/build/external/out:z \
 		-v $(srcdir)common:/opt/build/external/in:z \
-		shibboleth/$(2):$($(1)_COMPNAME) \
+		shibboleth/$(1):$(BASETAG) \
 		/bin/bash
 endef
 
-$(foreach platform,$(PLATFORMS),$(foreach component,$(COMPONENTS),$(eval $(call run-container-component-platform,$(component),$(platform)))))
+$(foreach platform,$(PLATFORMS),$(eval $(call run-container-platform,$(platform))))
 

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