<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13110">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">make/Makefile: allow overriding OSMO_TTCN3_BRANCH<br><br>Expose the OSMO_TTCN3_BRANCH build argument from ttcn3-*/Dockerfile as<br>environment variable, so it can be changed when building the images<br>with 'make' or './jenkins.sh'.<br><br>Dockerfiles that do not have a OSMO_TCCN3_BRANCH build arg produce a<br>warning. But this is also the case with Dockerfiles that don't have an<br>USER build arg, and avoiding the warning would only be possible with a<br>much more complex patch.<br><br>Change-Id: If2c312ff9206d1613fc19f41bd088c9aad523684<br>---<br>M README.md<br>M make/Makefile<br>2 files changed, 6 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/10/13110/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/README.md b/README.md</span><br><span>index adb6420..4977256 100644</span><br><span>--- a/README.md</span><br><span>+++ b/README.md</span><br><span>@@ -18,6 +18,9 @@</span><br><span> * `IMAGE_SUFFIX`: the version of the Osmocom stack to run the testsuite</span><br><span>   against. Default is `master`, set this to `latest` to test the last</span><br><span>   stable releases.</span><br><span style="color: hsl(120, 100%, 40%);">+* `OSMO_TTCN3_BRANCH`: [osmo-ttcn3-hacks.git](https://git.osmocom.org/osmo-ttcn3-hacks/)</span><br><span style="color: hsl(120, 100%, 40%);">+  branch, which will be used when building a `ttcn3-*` docker image.</span><br><span style="color: hsl(120, 100%, 40%);">+  Defaults to `master`.</span><br><span> * `NO_DOCKER_IMAGE_BUILD`: when set to `1`, it won't try to update the</span><br><span>   containers (see "caching" below)</span><br><span> </span><br><span>diff --git a/make/Makefile b/make/Makefile</span><br><span>index 5bbdbb7..2321fcf 100644</span><br><span>--- a/make/Makefile</span><br><span>+++ b/make/Makefile</span><br><span>@@ -16,6 +16,7 @@</span><br><span> REGISTRY_HOST?=docker.io</span><br><span> USERNAME?=$(USER)</span><br><span> NAME?=$(shell basename $(CURDIR))</span><br><span style="color: hsl(120, 100%, 40%);">+OSMO_TTCN3_BRANCH?=master</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>@@ -39,7 +40,8 @@</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) -t $(IMAGE):latest .</span><br><span style="color: hsl(120, 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%);">+                -t $(IMAGE):latest .</span><br><span>         @DOCKER_MAJOR=$(shell docker -v | sed -e 's/.*version //' -e 's/,.*//' | cut -d\. -f1) ; \</span><br><span>   DOCKER_MINOR=$(shell docker -v | sed -e 's/.*version //' -e 's/,.*//' | cut -d\. -f2) ; \</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13110">change 13110</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/13110"/><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-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: If2c312ff9206d1613fc19f41bd088c9aad523684 </div>
<div style="display:none"> Gerrit-Change-Number: 13110 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>