From 31b54054f709941efb2f7f164cc116374ac9ed91 Mon Sep 17 00:00:00 2001
From: Vadim Yanitskiy <vyanitskiy@sysmocom.de>
Date: Sat, 5 Feb 2022 19:21:25 +0600
Subject: [PATCH] make/Makefile: generalize passing additional build arguments

Building of some images may require additional options to be passed.

Change-Id: Id1761062ac6ec1d1a4eb6a6b724e42cf576c848f
---
 jenkins-common.sh | 2 +-
 make/Makefile     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jenkins-common.sh b/jenkins-common.sh
index 7130fe2f..3faf6a91 100644
--- a/jenkins-common.sh
+++ b/jenkins-common.sh
@@ -169,7 +169,7 @@ docker_images_require() {
 
 			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 34d5d25c..b2d344ec 100644
--- a/make/Makefile
+++ b/make/Makefile
@@ -37,7 +37,7 @@ OSMO_SGSN_BRANCH?=master
 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 @@ docker-build: .release
 		--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) ; \