fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/docker-playground/+/27072 )
Change subject: make/Makefile: generalize passing additional build arguments
......................................................................
make/Makefile: generalize passing additional build arguments
Building of some images may require additional options to be passed.
Change-Id: Id1761062ac6ec1d1a4eb6a6b724e42cf576c848f
---
M jenkins-common.sh
M make/Makefile
2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground
refs/changes/72/27072/1
diff --git a/jenkins-common.sh b/jenkins-common.sh
index 7130fe2..3faf6a9 100644
--- a/jenkins-common.sh
+++ b/jenkins-common.sh
@@ -169,7 +169,7 @@
echo "Building image: $i (export
NO_DOCKER_IMAGE_BUILD=1 to prevent this)"
make -C "${IMAGE_DIR_PREFIX}/${dir}" \
- PULL="$pull_arg" \
+ BUILD_ARGS="$pull_arg" \
UPSTREAM_DISTRO="$upstream_distro_arg" \
DISTRO="$distro_arg" \
IMAGE="$REPO_USER/$i" \
diff --git a/make/Makefile b/make/Makefile
index 34d5d25..b2d344e 100644
--- a/make/Makefile
+++ b/make/Makefile
@@ -37,7 +37,7 @@
OSMO_SIP_BRANCH?=master
OSMO_STP_BRANCH?=master
OPEN5GS_BRANCH?=main
-PULL?=
+BUILD_ARGS?=
UPSTREAM_DISTRO?=debian:bullseye
DISTRO?=debian-bullseye
@@ -114,7 +114,7 @@
--build-arg OSMO_SIP_BRANCH=$(OSMO_SIP_BRANCH) \
--build-arg OSMO_STP_BRANCH=$(OSMO_STP_BRANCH) \
--build-arg OPEN5GS_BRANCH=$(OPEN5GS_BRANCH) \
- $(PULL) -t $(IMAGE):latest .
+ $(BUILD_ARGS) -t $(IMAGE):latest .
@DOCKER_MAJOR=$(shell docker -v | sed -e 's/.*version //' -e 's/,.*//'
| cut -d\. -f1) ; \
DOCKER_MINOR=$(shell docker -v | sed -e 's/.*version //' -e 's/,.*//' |
cut -d\. -f2) ; \
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27072
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Id1761062ac6ec1d1a4eb6a6b724e42cf576c848f
Gerrit-Change-Number: 27072
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanits...@sysmocom.de>
Gerrit-MessageType: newchange
