From c83aad86c7f413f7df6add948e80b1236897f951 Mon Sep 17 00:00:00 2001 From: Adam Chalkley Date: Wed, 31 Jul 2024 06:59:19 -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 eb7ba28..7de84af 100644 --- a/Makefile +++ b/Makefile @@ -811,6 +811,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 \ @@ -831,6 +832,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 \ @@ -850,6 +852,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 \ @@ -870,6 +873,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 \ @@ -891,6 +895,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 \ @@ -913,6 +918,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 \