<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/18552">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">make/Makefile: add DISTRO, DOCKER_TAG arguments<br><br>Prepare to build osmo-*-master for multiple distributions by passing a<br>DISTRO argument. Add DOCKER_TAG, so we don't tag images for both debian<br>and centos as "latest". The next commits will make use of the new<br>arguments. While at it, do a cosmetic tweak to the "docker build" line.<br><br>Related: OS#4564<br>Change-Id: I1bf1c46295035a073e440faea3696ce53e7d7985<br>---<br>M make/Makefile<br>1 file changed, 13 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/52/18552/1</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..dfc7605 100644</span><br><span>--- a/make/Makefile</span><br><span>+++ b/make/Makefile</span><br><span>@@ -32,6 +32,8 @@</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%);">+DOCKER_TAG?=latest</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 +57,11 @@</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 DISTRO=$(DISTRO) \</span><br><span style="color: hsl(120, 100%, 40%);">+                --build-arg DOCKER_TAG=$(DOCKER_TAG) \</span><br><span style="color: hsl(120, 100%, 40%);">+                --build-arg OSMO_TTCN3_BRANCH=$(OSMO_TTCN3_BRANCH) \</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>@@ -70,17 +76,17 @@</span><br><span>               --build-arg OSMO_SGSN_BRANCH=$(OSMO_SGSN_BRANCH) \</span><br><span>           --build-arg OSMO_SIP_BRANCH=$(OSMO_SIP_BRANCH) \</span><br><span>             --build-arg OSMO_STP_BRANCH=$(OSMO_STP_BRANCH) \</span><br><span style="color: hsl(0, 100%, 40%);">-                $(PULL) -t $(IMAGE):latest .</span><br><span style="color: hsl(120, 100%, 40%);">+          $(PULL) -t $(IMAGE):$(DOCKER_TAG) .</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> tag: docker-build</span><br><span>   if [ $$DOCKER_MAJOR -eq 1 ] && [ $$DOCKER_MINOR -lt 10 ] ; then \</span><br><span style="color: hsl(0, 100%, 40%);">-               echo docker tag -f $(IMAGE):latest $(IMAGE):$(VERSION) ;\</span><br><span style="color: hsl(0, 100%, 40%);">-               docker tag -f $(IMAGE):latest $(IMAGE):$(VERSION) ;\</span><br><span style="color: hsl(120, 100%, 40%);">+          echo docker tag -f $(IMAGE):$(DOCKER_TAG) $(IMAGE):$(VERSION) ;\</span><br><span style="color: hsl(120, 100%, 40%);">+              docker tag -f $(IMAGE):$(DOCKER_TAG) $(IMAGE):$(VERSION) ;\</span><br><span>  else \</span><br><span style="color: hsl(0, 100%, 40%);">-          echo docker tag $(IMAGE):latest $(IMAGE):$(VERSION) ;\</span><br><span style="color: hsl(0, 100%, 40%);">-          docker tag $(IMAGE):latest $(IMAGE):$(VERSION) ; \</span><br><span style="color: hsl(120, 100%, 40%);">+            echo docker tag $(IMAGE):$(DOCKER_TAG) $(IMAGE):$(VERSION) ;\</span><br><span style="color: hsl(120, 100%, 40%);">+         docker tag $(IMAGE):$(DOCKER_TAG) $(IMAGE):$(VERSION) ; \</span><br><span>    fi</span><br><span> </span><br><span> .release:</span><br><span>@@ -95,7 +101,7 @@</span><br><span> push: do-push post-push</span><br><span> </span><br><span> do-push:</span><br><span style="color: hsl(0, 100%, 40%);">-     docker push $(IMAGE):latest</span><br><span style="color: hsl(120, 100%, 40%);">+   docker push $(IMAGE):$(DOCKER_TAG)</span><br><span>   [ -f .release ] && docker push $(IMAGE):$(VERSION)</span><br><span> </span><br><span> snapshot: build push</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: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>