<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/21238">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
daniel: Looks good to me, but someone else must approve
pespin: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">common: Automatize UPSTREAM_DISTRO name based on image name<br><br>Similar to what is already done with DISTRO, which points to given image<br>of ours based on name. This time we do the same with upstream images,<br>such as debian:stretch or centos:centos8.<br><br>This way, for instance calling docker_images_require<br>"osmo-bsc-latest-centos8" would try to build the<br>osmo-bsc-latest/Dockerfile file starting from a centos8 image.<br><br>Change-Id: I33cb21aa024396974559fd98f9f3c64e2c351eda<br>---<br>M centos-repo-install-test/Dockerfile<br>M centos8-build/Dockerfile<br>M debian-repo-install-test/Dockerfile<br>M debian-stretch-build/Dockerfile<br>M debian-stretch-titan/Dockerfile<br>M jenkins-common.sh<br>M make/Makefile<br>M osmo-bsc-latest/Dockerfile<br>M osmo-bts-latest/Dockerfile<br>M osmo-cn-latest/Dockerfile<br>M osmo-ggsn-latest/Dockerfile<br>M osmo-hlr-latest/Dockerfile<br>M osmo-hnbgw-latest/Dockerfile<br>M osmo-mgw-latest/Dockerfile<br>M osmo-msc-latest/Dockerfile<br>M osmo-nitb-latest/Dockerfile<br>M osmo-pcu-latest/Dockerfile<br>M osmo-remsim-latest/Dockerfile<br>M osmo-sgsn-latest/Dockerfile<br>M osmo-sip-latest/Dockerfile<br>M osmo-stp-latest/Dockerfile<br>21 files changed, 61 insertions(+), 26 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/centos-repo-install-test/Dockerfile b/centos-repo-install-test/Dockerfile</span><br><span>index 3f53650..5cbddb0 100644</span><br><span>--- a/centos-repo-install-test/Dockerfile</span><br><span>+++ b/centos-repo-install-test/Dockerfile</span><br><span>@@ -1,6 +1,7 @@</span><br><span> ARG USER</span><br><span> ARG REGISTRY=docker.io</span><br><span style="color: hsl(0, 100%, 40%);">-FROM ${REGISTRY}/centos:centos8</span><br><span style="color: hsl(120, 100%, 40%);">+ARG UPSTREAM_DISTRO=centos:centos8</span><br><span style="color: hsl(120, 100%, 40%);">+FROM ${REGISTRY}/${UPSTREAM_DISTRO}</span><br><span> </span><br><span> # dnf-utils: for repoquery</span><br><span> RUN dnf install -y \</span><br><span>@@ -9,4 +10,3 @@</span><br><span> </span><br><span> # Make additional development libraries available</span><br><span> RUN yum config-manager --set-enabled PowerTools</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/centos8-build/Dockerfile b/centos8-build/Dockerfile</span><br><span>index 46ce23e..e71e03c 100644</span><br><span>--- a/centos8-build/Dockerfile</span><br><span>+++ b/centos8-build/Dockerfile</span><br><span>@@ -1,5 +1,6 @@</span><br><span> ARG REGISTRY=docker.io</span><br><span style="color: hsl(0, 100%, 40%);">-FROM ${REGISTRY}/centos:centos8</span><br><span style="color: hsl(120, 100%, 40%);">+ARG UPSTREAM_DISTRO=centos:centos8</span><br><span style="color: hsl(120, 100%, 40%);">+FROM ${REGISTRY}/${UPSTREAM_DISTRO}</span><br><span> </span><br><span> # Let package metadata expire after 60 seconds instead of 48 hours</span><br><span> RUN echo "metadata_expire=60" >> /etc/dnf/dnf.conf && cat /etc/dnf/dnf.conf</span><br><span>diff --git a/debian-repo-install-test/Dockerfile b/debian-repo-install-test/Dockerfile</span><br><span>index e718a23..e12da75 100644</span><br><span>--- a/debian-repo-install-test/Dockerfile</span><br><span>+++ b/debian-repo-install-test/Dockerfile</span><br><span>@@ -1,6 +1,7 @@</span><br><span> ARG USER</span><br><span> ARG REGISTRY=docker.io</span><br><span style="color: hsl(0, 100%, 40%);">-FROM ${REGISTRY}/debian:stretch</span><br><span style="color: hsl(120, 100%, 40%);">+ARG UPSTREAM_DISTRO=debian:stretch</span><br><span style="color: hsl(120, 100%, 40%);">+FROM ${REGISTRY}/${UPSTREAM_DISTRO}</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span>diff --git a/debian-stretch-build/Dockerfile b/debian-stretch-build/Dockerfile</span><br><span>index ac52708..96e92de 100644</span><br><span>--- a/debian-stretch-build/Dockerfile</span><br><span>+++ b/debian-stretch-build/Dockerfile</span><br><span>@@ -1,5 +1,6 @@</span><br><span> ARG REGISTRY=docker.io</span><br><span style="color: hsl(0, 100%, 40%);">-FROM ${REGISTRY}/debian:stretch</span><br><span style="color: hsl(120, 100%, 40%);">+ARG UPSTREAM_DISTRO=debian:stretch</span><br><span style="color: hsl(120, 100%, 40%);">+FROM ${REGISTRY}/${UPSTREAM_DISTRO}</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>diff --git a/debian-stretch-titan/Dockerfile b/debian-stretch-titan/Dockerfile</span><br><span>index 7420348..01d941e 100644</span><br><span>--- a/debian-stretch-titan/Dockerfile</span><br><span>+++ b/debian-stretch-titan/Dockerfile</span><br><span>@@ -1,5 +1,6 @@</span><br><span> ARG REGISTRY=docker.io</span><br><span style="color: hsl(0, 100%, 40%);">-FROM ${REGISTRY}/debian:stretch</span><br><span style="color: hsl(120, 100%, 40%);">+ARG UPSTREAM_DISTRO=debian:stretch</span><br><span style="color: hsl(120, 100%, 40%);">+FROM ${REGISTRY}/${UPSTREAM_DISTRO}</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>diff --git a/jenkins-common.sh b/jenkins-common.sh</span><br><span>index d9e79a4..fdcfd40 100644</span><br><span>--- a/jenkins-common.sh</span><br><span>+++ b/jenkins-common.sh</span><br><span>@@ -12,10 +12,18 @@</span><br><span> </span><br><span> docker_distro_from_image_name() {</span><br><span> case "$1" in</span><br><span style="color: hsl(0, 100%, 40%);">- osmo-*-centos8) echo "centos8"; ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-*-centos8) echo "centos8" ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ centos8-*) echo "centos8" ;;</span><br><span> *) echo "debian-stretch" ;;</span><br><span> esac</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+docker_upstream_distro_from_image_name() {</span><br><span style="color: hsl(120, 100%, 40%);">+ case "$1" in</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-*-centos8) echo "centos:centos8"; ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ centos8-*) echo "centos:centos8" ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ *) echo "debian:stretch" ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ esac</span><br><span> }</span><br><span> </span><br><span> docker_dir_from_image_name() {</span><br><span>@@ -27,15 +35,20 @@</span><br><span> </span><br><span> # Make sure required images are available and build them if necessary.</span><br><span> # $*: image names (e.g. "debian-stretch-build", "osmo-mgw-master", "osmo-mgw-master-centos8")</span><br><span style="color: hsl(0, 100%, 40%);">-# The images are automatically built from the Dockerfile of the subdir of the same name. If there is a</span><br><span style="color: hsl(0, 100%, 40%);">-# distribution name at the end of the image name (e.g. osmo-mgw-master-centos8), it gets removed from the subdir</span><br><span style="color: hsl(0, 100%, 40%);">-# where the Dockerfile is taken from (e.g. osmo-mgw-master/Dockerfile) and DISTRO is passed accordingly</span><br><span style="color: hsl(0, 100%, 40%);">-# (e.g. DISTRO=centos8). This allows one Dockerfile for multiple distributions, without duplicating configs for</span><br><span style="color: hsl(0, 100%, 40%);">-# each distribution. Dependencies listed in docker_depends() are built automatically too.</span><br><span style="color: hsl(120, 100%, 40%);">+# The images are automatically built from the Dockerfile of the subdir of</span><br><span style="color: hsl(120, 100%, 40%);">+# the same name. If there is a distribution name at the end of the image</span><br><span style="color: hsl(120, 100%, 40%);">+# name (e.g. osmo-mgw-master-centos8), it gets removed from the subdir</span><br><span style="color: hsl(120, 100%, 40%);">+# where the Dockerfile is taken from (e.g. osmo-mgw-master/Dockerfile)</span><br><span style="color: hsl(120, 100%, 40%);">+# and UPSTREAM_DISTRO and DISTRO are passed accordingly (e.g.</span><br><span style="color: hsl(120, 100%, 40%);">+# UPSTREAM_DISTRO=centos:centos8 DISTRO=centos8). This allows one</span><br><span style="color: hsl(120, 100%, 40%);">+# Dockerfile for multiple distributions, without duplicating configs for</span><br><span style="color: hsl(120, 100%, 40%);">+# each distribution. Dependencies listed in docker_depends() are built</span><br><span style="color: hsl(120, 100%, 40%);">+# automatically too.</span><br><span> docker_images_require() {</span><br><span> local i</span><br><span> local from_line</span><br><span> local pull_arg</span><br><span style="color: hsl(120, 100%, 40%);">+ local upstream_distro_arg</span><br><span> local distro_arg</span><br><span> local depends</span><br><span> local dir</span><br><span>@@ -49,6 +62,7 @@</span><br><span> </span><br><span> # Trigger image build (cache will be used when up-to-date)</span><br><span> if [ -z "$NO_DOCKER_IMAGE_BUILD" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ upstream_distro_arg="$(docker_upstream_distro_from_image_name "$i")"</span><br><span> distro_arg="$(docker_distro_from_image_name "$i")"</span><br><span> dir="$(docker_dir_from_image_name "$i")"</span><br><span> </span><br><span>@@ -62,6 +76,7 @@</span><br><span> echo "Building image: $i (export NO_DOCKER_IMAGE_BUILD=1 to prevent this)"</span><br><span> make -C "../$dir" \</span><br><span> PULL="$pull_arg" \</span><br><span style="color: hsl(120, 100%, 40%);">+ UPSTREAM_DISTRO="$upstream_distro_arg" \</span><br><span> DISTRO="$distro_arg" \</span><br><span> IMAGE="$REPO_USER/$i" \</span><br><span> || exit 1</span><br><span>diff --git a/make/Makefile b/make/Makefile</span><br><span>index 1a13c4d..63562f3 100644</span><br><span>--- a/make/Makefile</span><br><span>+++ b/make/Makefile</span><br><span>@@ -33,6 +33,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%);">+UPSTREAM_DISTRO?=debian:stretch</span><br><span> DISTRO?=debian-stretch</span><br><span> </span><br><span> RELEASE_SUPPORT := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))/.make-release-support</span><br><span>@@ -61,6 +62,7 @@</span><br><span> --build-arg USER=$(USERNAME) \</span><br><span> --build-arg REGISTRY=$(REGISTRY_HOST) \</span><br><span> --build-arg OSMO_TTCN3_BRANCH=$(OSMO_TTCN3_BRANCH) \</span><br><span style="color: hsl(120, 100%, 40%);">+ --build-arg UPSTREAM_DISTRO=$(UPSTREAM_DISTRO) \</span><br><span> --build-arg DISTRO=$(DISTRO) \</span><br><span> --build-arg LIBOSMOCORE_BRANCH=$(LIBOSMOCORE_BRANCH) \</span><br><span> --build-arg OSMO_BB_BRANCH=$(OSMO_BB_BRANCH) \</span><br><span>diff --git a/osmo-bsc-latest/Dockerfile b/osmo-bsc-latest/Dockerfile</span><br><span>index 1ab1e02..178af72 100644</span><br><span>--- a/osmo-bsc-latest/Dockerfile</span><br><span>+++ b/osmo-bsc-latest/Dockerfile</span><br><span>@@ -1,5 +1,6 @@</span><br><span> ARG REGISTRY=docker.io</span><br><span style="color: hsl(0, 100%, 40%);">-FROM ${REGISTRY}/debian:stretch</span><br><span style="color: hsl(120, 100%, 40%);">+ARG UPSTREAM_DISTRO=debian:stretch</span><br><span style="color: hsl(120, 100%, 40%);">+FROM ${REGISTRY}/${UPSTREAM_DISTRO}</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>diff --git a/osmo-bts-latest/Dockerfile b/osmo-bts-latest/Dockerfile</span><br><span>index df1d832..954fc58 100644</span><br><span>--- a/osmo-bts-latest/Dockerfile</span><br><span>+++ b/osmo-bts-latest/Dockerfile</span><br><span>@@ -1,5 +1,6 @@</span><br><span> ARG REGISTRY=docker.io</span><br><span style="color: hsl(0, 100%, 40%);">-FROM ${REGISTRY}/debian:stretch</span><br><span style="color: hsl(120, 100%, 40%);">+ARG UPSTREAM_DISTRO=debian:stretch</span><br><span style="color: hsl(120, 100%, 40%);">+FROM ${REGISTRY}/${UPSTREAM_DISTRO}</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>diff --git a/osmo-cn-latest/Dockerfile b/osmo-cn-latest/Dockerfile</span><br><span>index ba98621..ca6859d 100644</span><br><span>--- a/osmo-cn-latest/Dockerfile</span><br><span>+++ b/osmo-cn-latest/Dockerfile</span><br><span>@@ -1,5 +1,6 @@</span><br><span> ARG REGISTRY=docker.io</span><br><span style="color: hsl(0, 100%, 40%);">-FROM ${REGISTRY}/debian:stretch</span><br><span style="color: hsl(120, 100%, 40%);">+ARG UPSTREAM_DISTRO=debian:stretch</span><br><span style="color: hsl(120, 100%, 40%);">+FROM ${REGISTRY}/${UPSTREAM_DISTRO}</span><br><span> </span><br><span> MAINTAINER Daniel Willmann <dwillmann@sysmocom.de></span><br><span> </span><br><span>diff --git a/osmo-ggsn-latest/Dockerfile b/osmo-ggsn-latest/Dockerfile</span><br><span>index ac50c4e..3430791 100644</span><br><span>--- a/osmo-ggsn-latest/Dockerfile</span><br><span>+++ b/osmo-ggsn-latest/Dockerfile</span><br><span>@@ -1,5 +1,6 @@</span><br><span> ARG REGISTRY=docker.io</span><br><span style="color: hsl(0, 100%, 40%);">-FROM ${REGISTRY}/debian:stretch</span><br><span style="color: hsl(120, 100%, 40%);">+ARG UPSTREAM_DISTRO=debian:stretch</span><br><span style="color: hsl(120, 100%, 40%);">+FROM ${REGISTRY}/${UPSTREAM_DISTRO}</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>diff --git a/osmo-hlr-latest/Dockerfile b/osmo-hlr-latest/Dockerfile</span><br><span>index 606a2df..a8e106c 100644</span><br><span>--- a/osmo-hlr-latest/Dockerfile</span><br><span>+++ b/osmo-hlr-latest/Dockerfile</span><br><span>@@ -1,5 +1,6 @@</span><br><span> ARG REGISTRY=docker.io</span><br><span style="color: hsl(0, 100%, 40%);">-FROM ${REGISTRY}/debian:stretch</span><br><span style="color: hsl(120, 100%, 40%);">+ARG UPSTREAM_DISTRO=debian:stretch</span><br><span style="color: hsl(120, 100%, 40%);">+FROM ${REGISTRY}/${UPSTREAM_DISTRO}</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>diff --git a/osmo-hnbgw-latest/Dockerfile b/osmo-hnbgw-latest/Dockerfile</span><br><span>index 15e515f..b39d2e7 100644</span><br><span>--- a/osmo-hnbgw-latest/Dockerfile</span><br><span>+++ b/osmo-hnbgw-latest/Dockerfile</span><br><span>@@ -1,5 +1,6 @@</span><br><span> ARG REGISTRY=docker.io</span><br><span style="color: hsl(0, 100%, 40%);">-FROM ${REGISTRY}/debian:stretch</span><br><span style="color: hsl(120, 100%, 40%);">+ARG UPSTREAM_DISTRO=debian:stretch</span><br><span style="color: hsl(120, 100%, 40%);">+FROM ${REGISTRY}/${UPSTREAM_DISTRO}</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>diff --git a/osmo-mgw-latest/Dockerfile b/osmo-mgw-latest/Dockerfile</span><br><span>index eba9ace..27fb259 100644</span><br><span>--- a/osmo-mgw-latest/Dockerfile</span><br><span>+++ b/osmo-mgw-latest/Dockerfile</span><br><span>@@ -1,5 +1,6 @@</span><br><span> ARG REGISTRY=docker.io</span><br><span style="color: hsl(0, 100%, 40%);">-FROM ${REGISTRY}/debian:stretch</span><br><span style="color: hsl(120, 100%, 40%);">+ARG UPSTREAM_DISTRO=debian:stretch</span><br><span style="color: hsl(120, 100%, 40%);">+FROM ${REGISTRY}/${UPSTREAM_DISTRO}</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>diff --git a/osmo-msc-latest/Dockerfile b/osmo-msc-latest/Dockerfile</span><br><span>index 6fc5858..e52a79a 100644</span><br><span>--- a/osmo-msc-latest/Dockerfile</span><br><span>+++ b/osmo-msc-latest/Dockerfile</span><br><span>@@ -1,5 +1,6 @@</span><br><span> ARG REGISTRY=docker.io</span><br><span style="color: hsl(0, 100%, 40%);">-FROM ${REGISTRY}/debian:stretch</span><br><span style="color: hsl(120, 100%, 40%);">+ARG UPSTREAM_DISTRO=debian:stretch</span><br><span style="color: hsl(120, 100%, 40%);">+FROM ${REGISTRY}/${UPSTREAM_DISTRO}</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>diff --git a/osmo-nitb-latest/Dockerfile b/osmo-nitb-latest/Dockerfile</span><br><span>index 5dafc33..ccdb75a 100644</span><br><span>--- a/osmo-nitb-latest/Dockerfile</span><br><span>+++ b/osmo-nitb-latest/Dockerfile</span><br><span>@@ -1,5 +1,6 @@</span><br><span> ARG REGISTRY=docker.io</span><br><span style="color: hsl(0, 100%, 40%);">-FROM ${REGISTRY}/debian:stretch</span><br><span style="color: hsl(120, 100%, 40%);">+ARG UPSTREAM_DISTRO=debian:stretch</span><br><span style="color: hsl(120, 100%, 40%);">+FROM ${REGISTRY}/${UPSTREAM_DISTRO}</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>diff --git a/osmo-pcu-latest/Dockerfile b/osmo-pcu-latest/Dockerfile</span><br><span>index ccd492c..ad5187e 100644</span><br><span>--- a/osmo-pcu-latest/Dockerfile</span><br><span>+++ b/osmo-pcu-latest/Dockerfile</span><br><span>@@ -1,5 +1,6 @@</span><br><span> ARG REGISTRY=docker.io</span><br><span style="color: hsl(0, 100%, 40%);">-FROM ${REGISTRY}/debian:stretch</span><br><span style="color: hsl(120, 100%, 40%);">+ARG UPSTREAM_DISTRO=debian:stretch</span><br><span style="color: hsl(120, 100%, 40%);">+FROM ${REGISTRY}/${UPSTREAM_DISTRO}</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>diff --git a/osmo-remsim-latest/Dockerfile b/osmo-remsim-latest/Dockerfile</span><br><span>index 2229032..fdc41ee 100644</span><br><span>--- a/osmo-remsim-latest/Dockerfile</span><br><span>+++ b/osmo-remsim-latest/Dockerfile</span><br><span>@@ -1,5 +1,6 @@</span><br><span> ARG REGISTRY=docker.io</span><br><span style="color: hsl(0, 100%, 40%);">-FROM ${REGISTRY}/debian:stretch</span><br><span style="color: hsl(120, 100%, 40%);">+ARG UPSTREAM_DISTRO=debian:stretch</span><br><span style="color: hsl(120, 100%, 40%);">+FROM ${REGISTRY}/${UPSTREAM_DISTRO}</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>diff --git a/osmo-sgsn-latest/Dockerfile b/osmo-sgsn-latest/Dockerfile</span><br><span>index f24b11c..23a06a1 100644</span><br><span>--- a/osmo-sgsn-latest/Dockerfile</span><br><span>+++ b/osmo-sgsn-latest/Dockerfile</span><br><span>@@ -1,5 +1,6 @@</span><br><span> ARG REGISTRY=docker.io</span><br><span style="color: hsl(0, 100%, 40%);">-FROM ${REGISTRY}/debian:stretch</span><br><span style="color: hsl(120, 100%, 40%);">+ARG UPSTREAM_DISTRO=debian:stretch</span><br><span style="color: hsl(120, 100%, 40%);">+FROM ${REGISTRY}/${UPSTREAM_DISTRO}</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>diff --git a/osmo-sip-latest/Dockerfile b/osmo-sip-latest/Dockerfile</span><br><span>index cdf1315..a310ecd 100644</span><br><span>--- a/osmo-sip-latest/Dockerfile</span><br><span>+++ b/osmo-sip-latest/Dockerfile</span><br><span>@@ -1,5 +1,6 @@</span><br><span> ARG REGISTRY=docker.io</span><br><span style="color: hsl(0, 100%, 40%);">-FROM ${REGISTRY}/debian:stretch</span><br><span style="color: hsl(120, 100%, 40%);">+ARG UPSTREAM_DISTRO=debian:stretch</span><br><span style="color: hsl(120, 100%, 40%);">+FROM ${REGISTRY}/${UPSTREAM_DISTRO}</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>diff --git a/osmo-stp-latest/Dockerfile b/osmo-stp-latest/Dockerfile</span><br><span>index aca833f..6651c44 100644</span><br><span>--- a/osmo-stp-latest/Dockerfile</span><br><span>+++ b/osmo-stp-latest/Dockerfile</span><br><span>@@ -1,5 +1,6 @@</span><br><span> ARG REGISTRY=docker.io</span><br><span style="color: hsl(0, 100%, 40%);">-FROM ${REGISTRY}/debian:stretch</span><br><span style="color: hsl(120, 100%, 40%);">+ARG UPSTREAM_DISTRO=debian:stretch</span><br><span style="color: hsl(120, 100%, 40%);">+FROM ${REGISTRY}/${UPSTREAM_DISTRO}</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/21238">change 21238</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/+/21238"/><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: I33cb21aa024396974559fd98f9f3c64e2c351eda </div>
<div style="display:none"> Gerrit-Change-Number: 21238 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>