<p>osmith <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/18552">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  laforge: Looks good to me, approved
  fixeria: Looks good to me, approved
  osmith: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">make/Makefile: add DISTRO argument<br><br>Prepare for distro-specific osmo-* images. While at it, put each<br>--build-arg on a separate line for readability.<br><br>Related: OS#4564<br>Change-Id: I1bf1c46295035a073e440faea3696ce53e7d7985<br>---<br>M make/Makefile<br>1 file changed, 5 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/make/Makefile b/make/Makefile</span><br><span>index b10c665..0dd111c 100644</span><br><span>--- a/make/Makefile</span><br><span>+++ b/make/Makefile</span><br><span>@@ -32,6 +32,7 @@</span><br><span> OSMO_SIP_BRANCH?=master</span><br><span> OSMO_STP_BRANCH?=master</span><br><span> PULL?=</span><br><span style="color: hsl(120, 100%, 40%);">+DISTRO?=debian-stretch</span><br><span> </span><br><span> RELEASE_SUPPORT := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))/.make-release-support</span><br><span> IMAGE?=$(REGISTRY_HOST)/$(USER)/$(NAME)</span><br><span>@@ -55,7 +56,10 @@</span><br><span> </span><br><span> </span><br><span> docker-build: .release</span><br><span style="color: hsl(0, 100%, 40%);">-        docker build --build-arg USER=$(USERNAME) --build-arg OSMO_TTCN3_BRANCH=$(OSMO_TTCN3_BRANCH) \</span><br><span style="color: hsl(120, 100%, 40%);">+        docker build \</span><br><span style="color: hsl(120, 100%, 40%);">+                --build-arg USER=$(USERNAME) \</span><br><span style="color: hsl(120, 100%, 40%);">+                --build-arg OSMO_TTCN3_BRANCH=$(OSMO_TTCN3_BRANCH) \</span><br><span style="color: hsl(120, 100%, 40%);">+          --build-arg DISTRO=$(DISTRO) \</span><br><span>               --build-arg OSMO_BB_BRANCH=$(OSMO_BB_BRANCH) \</span><br><span>               --build-arg OSMO_BSC_BRANCH=$(OSMO_BSC_BRANCH) \</span><br><span>             --build-arg OSMO_BTS_BRANCH=$(OSMO_BTS_BRANCH) \</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/18552">change 18552</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/docker-playground/+/18552"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: docker-playground </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I1bf1c46295035a073e440faea3696ce53e7d7985 </div>
<div style="display:none"> Gerrit-Change-Number: 18552 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>