Change in docker-playground[master]: make/Makefile: add DISTRO argument

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

osmith gerrit-no-reply at lists.osmocom.org
Sat May 30 09:36:58 UTC 2020


osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/18552 )

Change subject: make/Makefile: add DISTRO argument
......................................................................

make/Makefile: add DISTRO argument

Prepare for distro-specific osmo-* images. While at it, put each
--build-arg on a separate line for readability.

Related: OS#4564
Change-Id: I1bf1c46295035a073e440faea3696ce53e7d7985
---
M make/Makefile
1 file changed, 5 insertions(+), 1 deletion(-)

Approvals:
  laforge: Looks good to me, approved
  fixeria: Looks good to me, approved
  osmith: Verified



diff --git a/make/Makefile b/make/Makefile
index b10c665..0dd111c 100644
--- a/make/Makefile
+++ b/make/Makefile
@@ -32,6 +32,7 @@
 OSMO_SIP_BRANCH?=master
 OSMO_STP_BRANCH?=master
 PULL?=
+DISTRO?=debian-stretch
 
 RELEASE_SUPPORT := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))/.make-release-support
 IMAGE?=$(REGISTRY_HOST)/$(USER)/$(NAME)
@@ -55,7 +56,10 @@
 
 
 docker-build: .release
-	docker build --build-arg USER=$(USERNAME) --build-arg OSMO_TTCN3_BRANCH=$(OSMO_TTCN3_BRANCH) \
+	docker build \
+		--build-arg USER=$(USERNAME) \
+		--build-arg OSMO_TTCN3_BRANCH=$(OSMO_TTCN3_BRANCH) \
+		--build-arg DISTRO=$(DISTRO) \
 		--build-arg OSMO_BB_BRANCH=$(OSMO_BB_BRANCH) \
 		--build-arg OSMO_BSC_BRANCH=$(OSMO_BSC_BRANCH) \
 		--build-arg OSMO_BTS_BRANCH=$(OSMO_BTS_BRANCH) \

-- 
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/18552
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I1bf1c46295035a073e440faea3696ce53e7d7985
Gerrit-Change-Number: 18552
Gerrit-PatchSet: 5
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: fixeria <axilirator at gmail.com>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200530/68f372bd/attachment.htm>


More information about the gerrit-log mailing list