From faddb4e2cf7590dd8aa5b5390b8888859966c2db Mon Sep 17 00:00:00 2001 From: Adam Chalkley Date: Wed, 31 Jul 2024 06:48:07 -0500 Subject: [PATCH] Push `REPO_VERSION` var into containers for builds Set `REPO_VERSION` via Podman and Docker container run commands to properly have any externally set value (e.g., GitHub Actions) inherited by the container build environment. See also: - atc0005/shared-project-resources#208 --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile b/Makefile index cffd776d..708ada0f 100644 --- a/Makefile +++ b/Makefile @@ -821,6 +821,7 @@ docker-release-build: clean helper-builder-setup @echo @echo "Using release builder image to generate project release assets" $(CONTAINER_COMMAND) container run \ + --env REPO_VERSION=$(REPO_VERSION) \ --user builduser:builduser \ --rm \ -i \ @@ -841,6 +842,7 @@ podman-release-build: clean helper-builder-setup @echo @echo "Using release builder image to generate project release assets" $(CONTAINER_COMMAND) container run \ + --env REPO_VERSION=$(REPO_VERSION) \ --rm \ -i \ -v $$PWD/$(OUTPUTDIR):/builds/$(OUTPUTDIR):rw \ @@ -860,6 +862,7 @@ docker-dev-build: clean helper-builder-setup @echo @echo "Using release builder image to generate project release assets" $(CONTAINER_COMMAND) container run \ + --env REPO_VERSION=$(REPO_VERSION) \ --user builduser:builduser \ --rm \ -i \ @@ -880,6 +883,7 @@ podman-dev-build: clean helper-builder-setup @echo @echo "Using release builder image to generate project release assets" $(CONTAINER_COMMAND) container run \ + --env REPO_VERSION=$(REPO_VERSION) \ --rm \ -i \ -v $$PWD/$(OUTPUTDIR):/builds/$(OUTPUTDIR):rw \ @@ -901,6 +905,7 @@ docker-packages: helper-builder-setup @echo "Building with $(CONTAINER_COMMAND)" $(CONTAINER_COMMAND) container run \ + --env REPO_VERSION=$(REPO_VERSION) \ --rm \ --user builduser:builduser \ -i \ @@ -923,6 +928,7 @@ podman-packages: helper-builder-setup @echo "Building with $(CONTAINER_COMMAND)" $(CONTAINER_COMMAND) container run \ + --env REPO_VERSION=$(REPO_VERSION) \ --rm \ -i \ -v $$PWD/$(OUTPUTDIR):/builds/$(OUTPUTDIR):rw \