<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/21239">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">common: Introduce OSMOCOM_REPO_MIRROR param<br><br>This allows easily changing to another osmocom repo base URL if the<br>default one is down.<br><br>Related: OS#4862<br>Change-Id: I8010b08f3dabacfb3c13a44eece6c7a490e0742e<br>---<br>M debian-buster-erlang/Dockerfile<br>M debian-buster-simtrace2/Dockerfile<br>M debian-jessie-osmocom/Dockerfile<br>M debian-stretch-build-dist/Dockerfile<br>M debian-stretch-jenkins/Dockerfile<br>M debian-stretch-titan/Dockerfile<br>M make/Makefile<br>M osmo-bsc-latest/Dockerfile<br>M osmo-bsc-master/Dockerfile<br>M osmo-bts-latest/Dockerfile<br>M osmo-bts-master/Dockerfile<br>M osmo-cn-latest/Dockerfile<br>M osmo-ggsn-latest/Dockerfile<br>M osmo-ggsn-master/Dockerfile<br>M osmo-gsm-tester/Dockerfile<br>M osmo-hlr-latest/Dockerfile<br>M osmo-hlr-master/Dockerfile<br>M osmo-hnbgw-latest/Dockerfile<br>M osmo-hnbgw-master/Dockerfile<br>M osmo-mgw-latest/Dockerfile<br>M osmo-mgw-master/Dockerfile<br>M osmo-msc-latest/Dockerfile<br>M osmo-msc-master/Dockerfile<br>M osmo-nitb-latest/Dockerfile<br>M osmo-nitb-master/Dockerfile<br>M osmo-pcu-latest/Dockerfile<br>M osmo-pcu-master/Dockerfile<br>M osmo-remsim-latest/Dockerfile<br>M osmo-remsim-master/Dockerfile<br>M osmo-sgsn-latest/Dockerfile<br>M osmo-sgsn-master/Dockerfile<br>M osmo-sip-latest/Dockerfile<br>M osmo-sip-master/Dockerfile<br>M osmo-smlc-master/Dockerfile<br>M osmo-stp-latest/Dockerfile<br>M osmo-stp-master/Dockerfile<br>M osmo-uecups-master/Dockerfile<br>M osmocom-bb-host-master/Dockerfile<br>38 files changed, 142 insertions(+), 57 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/39/21239/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/debian-buster-erlang/Dockerfile b/debian-buster-erlang/Dockerfile</span><br><span>index 8ac470f..f680276 100644</span><br><span>--- a/debian-buster-erlang/Dockerfile</span><br><span>+++ b/debian-buster-erlang/Dockerfile</span><br><span>@@ -1,9 +1,11 @@</span><br><span> ARG REGISTRY=docker.io</span><br><span> FROM ${REGISTRY}/debian:buster</span><br><span style="color: hsl(120, 100%, 40%);">+# Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_10/"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_10/"</span><br><span> </span><br><span> # install the erlang vm and rebar (2)</span><br><span> RUN apt-get update && \</span><br><span>diff --git a/debian-buster-simtrace2/Dockerfile b/debian-buster-simtrace2/Dockerfile</span><br><span>index cd1d359..17a6ac8 100644</span><br><span>--- a/debian-buster-simtrace2/Dockerfile</span><br><span>+++ b/debian-buster-simtrace2/Dockerfile</span><br><span>@@ -1,9 +1,11 @@</span><br><span> ARG USER</span><br><span> FROM $USER/debian-buster-build</span><br><span style="color: hsl(120, 100%, 40%);">+# Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_10/"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_10/"</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span>diff --git a/debian-jessie-osmocom/Dockerfile b/debian-jessie-osmocom/Dockerfile</span><br><span>index 77c223f..239e370 100644</span><br><span>--- a/debian-jessie-osmocom/Dockerfile</span><br><span>+++ b/debian-jessie-osmocom/Dockerfile</span><br><span>@@ -1,9 +1,11 @@</span><br><span> ARG REGISTRY=docker.io</span><br><span> FROM ${REGISTRY}/debian:jessie</span><br><span style="color: hsl(120, 100%, 40%);">+# Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_8.0/"</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span>diff --git a/debian-stretch-build-dist/Dockerfile b/debian-stretch-build-dist/Dockerfile</span><br><span>index a1f0290..c742ac4 100644</span><br><span>--- a/debian-stretch-build-dist/Dockerfile</span><br><span>+++ b/debian-stretch-build-dist/Dockerfile</span><br><span>@@ -1,7 +1,9 @@</span><br><span> ARG USER</span><br><span> FROM $USER/debian-stretch-build</span><br><span style="color: hsl(120, 100%, 40%);">+# Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_9.0/"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span>diff --git a/debian-stretch-jenkins/Dockerfile b/debian-stretch-jenkins/Dockerfile</span><br><span>index c682d9c..2620076 100644</span><br><span>--- a/debian-stretch-jenkins/Dockerfile</span><br><span>+++ b/debian-stretch-jenkins/Dockerfile</span><br><span>@@ -4,6 +4,8 @@</span><br><span> ARG DEBIAN_VERSION=stretch</span><br><span> ARG REGISTRY=docker.io</span><br><span> FROM ${REGISTRY}/debian:${DEBIAN_VERSION}</span><br><span style="color: hsl(120, 100%, 40%);">+# Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> </span><br><span> # Make "$DEBIAN_VERSION" available after FROM</span><br><span> # https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact</span><br><span>@@ -153,7 +155,7 @@</span><br><span> ENV LANG en_US.UTF-8</span><br><span> </span><br><span> # osmo-remsim needs libulfius which is built in osmocom OBS repos:</span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/"</span><br><span> COPY Release.key /tmp/Release.key</span><br><span> RUN apt-key add /tmp/Release.key && \</span><br><span> rm /tmp/Release.key && \</span><br><span>diff --git a/debian-stretch-titan/Dockerfile b/debian-stretch-titan/Dockerfile</span><br><span>index 01d941e..bf7d6f9 100644</span><br><span>--- a/debian-stretch-titan/Dockerfile</span><br><span>+++ b/debian-stretch-titan/Dockerfile</span><br><span>@@ -1,10 +1,12 @@</span><br><span> ARG REGISTRY=docker.io</span><br><span> ARG UPSTREAM_DISTRO=debian:stretch</span><br><span> FROM ${REGISTRY}/${UPSTREAM_DISTRO}</span><br><span style="color: hsl(120, 100%, 40%);">+# Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_9.0/"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"</span><br><span> </span><br><span> RUN apt-get update && apt-get install -y \</span><br><span> gnupg</span><br><span>diff --git a/make/Makefile b/make/Makefile</span><br><span>index 63562f3..4f2263b 100644</span><br><span>--- a/make/Makefile</span><br><span>+++ b/make/Makefile</span><br><span>@@ -35,6 +35,8 @@</span><br><span> PULL?=</span><br><span> UPSTREAM_DISTRO?=debian:stretch</span><br><span> DISTRO?=debian-stretch</span><br><span style="color: hsl(120, 100%, 40%);">+OSMOCOM_REPO_MIRROR?=http://download.opensuse.org</span><br><span style="color: hsl(120, 100%, 40%);">+# Use if down: OSMOCOM_REPO_MIRROR=http://ftp.uni-stuttgart.de/opensuse</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>@@ -64,6 +66,7 @@</span><br><span> --build-arg OSMO_TTCN3_BRANCH=$(OSMO_TTCN3_BRANCH) \</span><br><span> --build-arg UPSTREAM_DISTRO=$(UPSTREAM_DISTRO) \</span><br><span> --build-arg DISTRO=$(DISTRO) \</span><br><span style="color: hsl(120, 100%, 40%);">+ --build-arg OSMOCOM_REPO_MIRROR=$(OSMOCOM_REPO_MIRROR) \</span><br><span> --build-arg LIBOSMOCORE_BRANCH=$(LIBOSMOCORE_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>diff --git a/osmo-bsc-latest/Dockerfile b/osmo-bsc-latest/Dockerfile</span><br><span>index 178af72..7a7143c 100644</span><br><span>--- a/osmo-bsc-latest/Dockerfile</span><br><span>+++ b/osmo-bsc-latest/Dockerfile</span><br><span>@@ -1,10 +1,12 @@</span><br><span> ARG REGISTRY=docker.io</span><br><span> ARG UPSTREAM_DISTRO=debian:stretch</span><br><span> FROM ${REGISTRY}/${UPSTREAM_DISTRO}</span><br><span style="color: hsl(120, 100%, 40%);">+# Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_9.0/"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span>diff --git a/osmo-bsc-master/Dockerfile b/osmo-bsc-master/Dockerfile</span><br><span>index 6c39831..28d1672 100644</span><br><span>--- a/osmo-bsc-master/Dockerfile</span><br><span>+++ b/osmo-bsc-master/Dockerfile</span><br><span>@@ -1,12 +1,14 @@</span><br><span> ARG USER</span><br><span> ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> FROM $USER/$DISTRO-build</span><br><span> # Arguments used after FROM must be specified again</span><br><span> ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/"</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span>@@ -21,7 +23,7 @@</span><br><span> # we need to add this to invalidate the cache once the repository is updated.</span><br><span> # unfortunately Dockerfiles don't support a conditional ARG, so we need to add both DPKG + RPM</span><br><span> ADD $OSMOCOM_REPO/Release /tmp/Release</span><br><span style="color: hsl(0, 100%, 40%);">-ADD http://download.opensuse.org/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span style="color: hsl(120, 100%, 40%);">+ADD $OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span> RUN case "$DISTRO" in \</span><br><span> debian*) \</span><br><span> apt-get update && \</span><br><span>diff --git a/osmo-bts-latest/Dockerfile b/osmo-bts-latest/Dockerfile</span><br><span>index 954fc58..892369f 100644</span><br><span>--- a/osmo-bts-latest/Dockerfile</span><br><span>+++ b/osmo-bts-latest/Dockerfile</span><br><span>@@ -1,10 +1,12 @@</span><br><span> ARG REGISTRY=docker.io</span><br><span> ARG UPSTREAM_DISTRO=debian:stretch</span><br><span> FROM ${REGISTRY}/${UPSTREAM_DISTRO}</span><br><span style="color: hsl(120, 100%, 40%);">+# Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_9.0/"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span>diff --git a/osmo-bts-master/Dockerfile b/osmo-bts-master/Dockerfile</span><br><span>index df6ebb6..b0b3aa4 100644</span><br><span>--- a/osmo-bts-master/Dockerfile</span><br><span>+++ b/osmo-bts-master/Dockerfile</span><br><span>@@ -1,12 +1,14 @@</span><br><span> ARG USER</span><br><span> ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> FROM $USER/$DISTRO-build</span><br><span> # Arguments used after FROM must be specified again</span><br><span> ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/"</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span>@@ -21,7 +23,7 @@</span><br><span> # we need to add this to invalidate the cache once the repository is updated.</span><br><span> # unfortunately Dockerfiles don't support a conditional ARG, so we need to add both DPKG + RPM</span><br><span> ADD $OSMOCOM_REPO/Release /tmp/Release</span><br><span style="color: hsl(0, 100%, 40%);">-ADD http://download.opensuse.org/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span style="color: hsl(120, 100%, 40%);">+ADD $OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span> RUN case "$DISTRO" in \</span><br><span> debian*) \</span><br><span> apt-get update && \</span><br><span>diff --git a/osmo-cn-latest/Dockerfile b/osmo-cn-latest/Dockerfile</span><br><span>index ca6859d..e36b147 100644</span><br><span>--- a/osmo-cn-latest/Dockerfile</span><br><span>+++ b/osmo-cn-latest/Dockerfile</span><br><span>@@ -1,10 +1,12 @@</span><br><span> ARG REGISTRY=docker.io</span><br><span> ARG UPSTREAM_DISTRO=debian:stretch</span><br><span> FROM ${REGISTRY}/${UPSTREAM_DISTRO}</span><br><span style="color: hsl(120, 100%, 40%);">+# Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> </span><br><span> MAINTAINER Daniel Willmann <dwillmann@sysmocom.de></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_9.0/"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span>diff --git a/osmo-ggsn-latest/Dockerfile b/osmo-ggsn-latest/Dockerfile</span><br><span>index 3430791..dab0152 100644</span><br><span>--- a/osmo-ggsn-latest/Dockerfile</span><br><span>+++ b/osmo-ggsn-latest/Dockerfile</span><br><span>@@ -1,10 +1,12 @@</span><br><span> ARG REGISTRY=docker.io</span><br><span> ARG UPSTREAM_DISTRO=debian:stretch</span><br><span> FROM ${REGISTRY}/${UPSTREAM_DISTRO}</span><br><span style="color: hsl(120, 100%, 40%);">+# Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_9.0/"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span>diff --git a/osmo-ggsn-master/Dockerfile b/osmo-ggsn-master/Dockerfile</span><br><span>index a70a62e..653d604 100644</span><br><span>--- a/osmo-ggsn-master/Dockerfile</span><br><span>+++ b/osmo-ggsn-master/Dockerfile</span><br><span>@@ -1,12 +1,14 @@</span><br><span> ARG USER</span><br><span> ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> FROM $USER/$DISTRO-build</span><br><span> # Arguments used after FROM must be specified again</span><br><span> ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/"</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span>@@ -21,7 +23,7 @@</span><br><span> # we need to add this to invalidate the cache once the repository is updated.</span><br><span> # unfortunately Dockerfiles don't support a conditional ARG, so we need to add both DPKG + RPM</span><br><span> ADD $OSMOCOM_REPO/Release /tmp/Release</span><br><span style="color: hsl(0, 100%, 40%);">-ADD http://download.opensuse.org/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span style="color: hsl(120, 100%, 40%);">+ADD $OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span> RUN case "$DISTRO" in \</span><br><span> debian*) \</span><br><span> apt-get update && \</span><br><span>diff --git a/osmo-gsm-tester/Dockerfile b/osmo-gsm-tester/Dockerfile</span><br><span>index a19c385..5ec6fdb 100644</span><br><span>--- a/osmo-gsm-tester/Dockerfile</span><br><span>+++ b/osmo-gsm-tester/Dockerfile</span><br><span>@@ -1,5 +1,7 @@</span><br><span> ARG USER</span><br><span> FROM $USER/debian-stretch-jenkins</span><br><span style="color: hsl(120, 100%, 40%);">+# Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> </span><br><span> MAINTAINER Pau Espin Pedrol <pespin@sysmocom.de></span><br><span> </span><br><span>@@ -75,7 +77,7 @@</span><br><span> make && \</span><br><span> make install</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/"</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span>diff --git a/osmo-hlr-latest/Dockerfile b/osmo-hlr-latest/Dockerfile</span><br><span>index a8e106c..fc5ab07 100644</span><br><span>--- a/osmo-hlr-latest/Dockerfile</span><br><span>+++ b/osmo-hlr-latest/Dockerfile</span><br><span>@@ -1,10 +1,12 @@</span><br><span> ARG REGISTRY=docker.io</span><br><span> ARG UPSTREAM_DISTRO=debian:stretch</span><br><span> FROM ${REGISTRY}/${UPSTREAM_DISTRO}</span><br><span style="color: hsl(120, 100%, 40%);">+# Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_9.0/"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span>diff --git a/osmo-hlr-master/Dockerfile b/osmo-hlr-master/Dockerfile</span><br><span>index b6e572b..430e691 100644</span><br><span>--- a/osmo-hlr-master/Dockerfile</span><br><span>+++ b/osmo-hlr-master/Dockerfile</span><br><span>@@ -1,12 +1,14 @@</span><br><span> ARG USER</span><br><span> ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> FROM $USER/$DISTRO-build</span><br><span> # Arguments used after FROM must be specified again</span><br><span> ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/"</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span>@@ -21,7 +23,7 @@</span><br><span> # we need to add this to invalidate the cache once the repository is updated.</span><br><span> # unfortunately Dockerfiles don't support a conditional ARG, so we need to add both DPKG + RPM</span><br><span> ADD $OSMOCOM_REPO/Release /tmp/Release</span><br><span style="color: hsl(0, 100%, 40%);">-ADD http://download.opensuse.org/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span style="color: hsl(120, 100%, 40%);">+ADD $OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span> RUN case "$DISTRO" in \</span><br><span> debian*) \</span><br><span> apt-get update && \</span><br><span>diff --git a/osmo-hnbgw-latest/Dockerfile b/osmo-hnbgw-latest/Dockerfile</span><br><span>index b39d2e7..7f3cf29 100644</span><br><span>--- a/osmo-hnbgw-latest/Dockerfile</span><br><span>+++ b/osmo-hnbgw-latest/Dockerfile</span><br><span>@@ -1,10 +1,12 @@</span><br><span> ARG REGISTRY=docker.io</span><br><span> ARG UPSTREAM_DISTRO=debian:stretch</span><br><span> FROM ${REGISTRY}/${UPSTREAM_DISTRO}</span><br><span style="color: hsl(120, 100%, 40%);">+# Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_9.0/"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span>diff --git a/osmo-hnbgw-master/Dockerfile b/osmo-hnbgw-master/Dockerfile</span><br><span>index 2e7b0b7..4814ee1 100644</span><br><span>--- a/osmo-hnbgw-master/Dockerfile</span><br><span>+++ b/osmo-hnbgw-master/Dockerfile</span><br><span>@@ -1,9 +1,13 @@</span><br><span> ARG USER</span><br><span style="color: hsl(0, 100%, 40%);">-FROM $USER/debian-stretch-build</span><br><span style="color: hsl(120, 100%, 40%);">+ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/$DISTRO-build</span><br><span style="color: hsl(120, 100%, 40%);">+# Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/"</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span>@@ -14,7 +18,7 @@</span><br><span> # we need to add this to invalidate the cache once the repository is updated.</span><br><span> # unfortunately Dockerfiles don't support a conditional ARG, so we need to add both DPKG + RPM</span><br><span> ADD $OSMOCOM_REPO/Release /tmp/Release</span><br><span style="color: hsl(0, 100%, 40%);">-ADD http://download.opensuse.org/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span style="color: hsl(120, 100%, 40%);">+ADD $OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span> RUN apt-get update && \</span><br><span> apt-get install -y --no-install-recommends \</span><br><span> telnet \</span><br><span>diff --git a/osmo-mgw-latest/Dockerfile b/osmo-mgw-latest/Dockerfile</span><br><span>index 27fb259..c346095 100644</span><br><span>--- a/osmo-mgw-latest/Dockerfile</span><br><span>+++ b/osmo-mgw-latest/Dockerfile</span><br><span>@@ -1,10 +1,12 @@</span><br><span> ARG REGISTRY=docker.io</span><br><span> ARG UPSTREAM_DISTRO=debian:stretch</span><br><span> FROM ${REGISTRY}/${UPSTREAM_DISTRO}</span><br><span style="color: hsl(120, 100%, 40%);">+# Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_9.0/"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span>diff --git a/osmo-mgw-master/Dockerfile b/osmo-mgw-master/Dockerfile</span><br><span>index ccc5d80..0e58f2e 100644</span><br><span>--- a/osmo-mgw-master/Dockerfile</span><br><span>+++ b/osmo-mgw-master/Dockerfile</span><br><span>@@ -1,12 +1,14 @@</span><br><span> ARG USER</span><br><span> ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> FROM $USER/$DISTRO-build</span><br><span> # Arguments used after FROM must be specified again</span><br><span> ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/"</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span>@@ -21,7 +23,7 @@</span><br><span> # we need to add this to invalidate the cache once the repository is updated.</span><br><span> # unfortunately Dockerfiles don't support a conditional ARG, so we need to add both DPKG + RPM</span><br><span> ADD $OSMOCOM_REPO/Release /tmp/Release</span><br><span style="color: hsl(0, 100%, 40%);">-ADD http://download.opensuse.org/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span style="color: hsl(120, 100%, 40%);">+ADD $OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span> RUN case "$DISTRO" in \</span><br><span> debian*) \</span><br><span> apt-get update && \</span><br><span>diff --git a/osmo-msc-latest/Dockerfile b/osmo-msc-latest/Dockerfile</span><br><span>index e52a79a..6c0db6b 100644</span><br><span>--- a/osmo-msc-latest/Dockerfile</span><br><span>+++ b/osmo-msc-latest/Dockerfile</span><br><span>@@ -1,10 +1,12 @@</span><br><span> ARG REGISTRY=docker.io</span><br><span> ARG UPSTREAM_DISTRO=debian:stretch</span><br><span> FROM ${REGISTRY}/${UPSTREAM_DISTRO}</span><br><span style="color: hsl(120, 100%, 40%);">+# Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_9.0/"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span>diff --git a/osmo-msc-master/Dockerfile b/osmo-msc-master/Dockerfile</span><br><span>index c7e8508..ae3d49e 100644</span><br><span>--- a/osmo-msc-master/Dockerfile</span><br><span>+++ b/osmo-msc-master/Dockerfile</span><br><span>@@ -1,12 +1,14 @@</span><br><span> ARG USER</span><br><span> ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> FROM $USER/$DISTRO-build</span><br><span> # Arguments used after FROM must be specified again</span><br><span> ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/"</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span>@@ -21,7 +23,7 @@</span><br><span> # we need to add this to invalidate the cache once the repository is updated.</span><br><span> # unfortunately Dockerfiles don't support a conditional ARG, so we need to add both DPKG + RPM</span><br><span> ADD $OSMOCOM_REPO/Release /tmp/Release</span><br><span style="color: hsl(0, 100%, 40%);">-ADD http://download.opensuse.org/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span style="color: hsl(120, 100%, 40%);">+ADD $OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span> RUN case "$DISTRO" in \</span><br><span> debian*) \</span><br><span> apt-get update && \</span><br><span>diff --git a/osmo-nitb-latest/Dockerfile b/osmo-nitb-latest/Dockerfile</span><br><span>index ccdb75a..0e6f72a 100644</span><br><span>--- a/osmo-nitb-latest/Dockerfile</span><br><span>+++ b/osmo-nitb-latest/Dockerfile</span><br><span>@@ -1,10 +1,12 @@</span><br><span> ARG REGISTRY=docker.io</span><br><span> ARG UPSTREAM_DISTRO=debian:stretch</span><br><span> FROM ${REGISTRY}/${UPSTREAM_DISTRO}</span><br><span style="color: hsl(120, 100%, 40%);">+# Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_9.0/"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span>diff --git a/osmo-nitb-master/Dockerfile b/osmo-nitb-master/Dockerfile</span><br><span>index edb5434..4ac949e 100644</span><br><span>--- a/osmo-nitb-master/Dockerfile</span><br><span>+++ b/osmo-nitb-master/Dockerfile</span><br><span>@@ -1,9 +1,14 @@</span><br><span> ARG USER</span><br><span style="color: hsl(0, 100%, 40%);">-FROM $USER/debian-stretch-build</span><br><span style="color: hsl(120, 100%, 40%);">+ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/$DISTRO-build</span><br><span style="color: hsl(120, 100%, 40%);">+# Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/"</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span>@@ -14,7 +19,7 @@</span><br><span> # we need to add this to invalidate the cache once the repository is updated.</span><br><span> # unfortunately Dockerfiles don't support a conditional ARG, so we need to add both DPKG + RPM</span><br><span> ADD $OSMOCOM_REPO/Release /tmp/Release</span><br><span style="color: hsl(0, 100%, 40%);">-ADD http://download.opensuse.org/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span style="color: hsl(120, 100%, 40%);">+ADD $OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span> RUN apt-get update && \</span><br><span> apt-get install -y --no-install-recommends \</span><br><span> telnet \</span><br><span>diff --git a/osmo-pcu-latest/Dockerfile b/osmo-pcu-latest/Dockerfile</span><br><span>index ad5187e..bc6ebe9 100644</span><br><span>--- a/osmo-pcu-latest/Dockerfile</span><br><span>+++ b/osmo-pcu-latest/Dockerfile</span><br><span>@@ -1,10 +1,12 @@</span><br><span> ARG REGISTRY=docker.io</span><br><span> ARG UPSTREAM_DISTRO=debian:stretch</span><br><span> FROM ${REGISTRY}/${UPSTREAM_DISTRO}</span><br><span style="color: hsl(120, 100%, 40%);">+# Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_9.0/"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span>@@ -35,4 +37,4 @@</span><br><span> WORKDIR /data</span><br><span> CMD ["/usr/bin/osmo-pcu"]</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#EXPOSE </span><br><span style="color: hsl(120, 100%, 40%);">+#EXPOSE</span><br><span>diff --git a/osmo-pcu-master/Dockerfile b/osmo-pcu-master/Dockerfile</span><br><span>index af4426b..d727efc 100644</span><br><span>--- a/osmo-pcu-master/Dockerfile</span><br><span>+++ b/osmo-pcu-master/Dockerfile</span><br><span>@@ -1,12 +1,14 @@</span><br><span> ARG USER</span><br><span> ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> FROM $USER/$DISTRO-build</span><br><span> # Arguments used after FROM must be specified again</span><br><span> ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/"</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span>@@ -21,7 +23,7 @@</span><br><span> # we need to add this to invalidate the cache once the repository is updated.</span><br><span> # unfortunately Dockerfiles don't support a conditional ARG, so we need to add both DPKG + RPM</span><br><span> ADD $OSMOCOM_REPO/Release /tmp/Release</span><br><span style="color: hsl(0, 100%, 40%);">-ADD http://download.opensuse.org/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span style="color: hsl(120, 100%, 40%);">+ADD $OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span> RUN case "$DISTRO" in \</span><br><span> debian*) \</span><br><span> apt-get update && \</span><br><span>diff --git a/osmo-remsim-latest/Dockerfile b/osmo-remsim-latest/Dockerfile</span><br><span>index fdc41ee..f34a656 100644</span><br><span>--- a/osmo-remsim-latest/Dockerfile</span><br><span>+++ b/osmo-remsim-latest/Dockerfile</span><br><span>@@ -1,10 +1,12 @@</span><br><span> ARG REGISTRY=docker.io</span><br><span> ARG UPSTREAM_DISTRO=debian:stretch</span><br><span> FROM ${REGISTRY}/${UPSTREAM_DISTRO}</span><br><span style="color: hsl(120, 100%, 40%);">+# Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_9.0/"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span>@@ -37,4 +39,4 @@</span><br><span> WORKDIR /data</span><br><span> CMD ["/bin/sh", "-c", "/usr/bin/osmo-resmim-server >/data/osmo-resmim-server.log 2>&1"]</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#EXPOSE </span><br><span style="color: hsl(120, 100%, 40%);">+#EXPOSE</span><br><span>diff --git a/osmo-remsim-master/Dockerfile b/osmo-remsim-master/Dockerfile</span><br><span>index d50f624..ce63013 100644</span><br><span>--- a/osmo-remsim-master/Dockerfile</span><br><span>+++ b/osmo-remsim-master/Dockerfile</span><br><span>@@ -1,8 +1,10 @@</span><br><span> ARG USER</span><br><span> ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> FROM $USER/$DISTRO-build</span><br><span> # Arguments used after FROM must be specified again</span><br><span> ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>@@ -31,7 +33,7 @@</span><br><span> RUN cd vsmartcard/virtualsmartcard && autoreconf -fi && ./configure && make "-j$(nproc)" install</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/"</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span>@@ -46,7 +48,7 @@</span><br><span> # we need to add this to invalidate the cache once the repository is updated.</span><br><span> # unfortunately Dockerfiles don't support a conditional ARG, so we need to add both DPKG + RPM</span><br><span> ADD $OSMOCOM_REPO/Release /tmp/Release</span><br><span style="color: hsl(0, 100%, 40%);">-ADD http://download.opensuse.org/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span style="color: hsl(120, 100%, 40%);">+ADD $OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span> RUN case "$DISTRO" in \</span><br><span> debian*) \</span><br><span> apt-get update && \</span><br><span>diff --git a/osmo-sgsn-latest/Dockerfile b/osmo-sgsn-latest/Dockerfile</span><br><span>index 23a06a1..163475b 100644</span><br><span>--- a/osmo-sgsn-latest/Dockerfile</span><br><span>+++ b/osmo-sgsn-latest/Dockerfile</span><br><span>@@ -1,10 +1,12 @@</span><br><span> ARG REGISTRY=docker.io</span><br><span> ARG UPSTREAM_DISTRO=debian:stretch</span><br><span> FROM ${REGISTRY}/${UPSTREAM_DISTRO}</span><br><span style="color: hsl(120, 100%, 40%);">+# Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_9.0/"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span>diff --git a/osmo-sgsn-master/Dockerfile b/osmo-sgsn-master/Dockerfile</span><br><span>index c50b476..004ccb0 100644</span><br><span>--- a/osmo-sgsn-master/Dockerfile</span><br><span>+++ b/osmo-sgsn-master/Dockerfile</span><br><span>@@ -1,12 +1,14 @@</span><br><span> ARG USER</span><br><span> ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> FROM $USER/$DISTRO-build</span><br><span> # Arguments used after FROM must be specified again</span><br><span> ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/"</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span>@@ -21,7 +23,7 @@</span><br><span> # we need to add this to invalidate the cache once the repository is updated.</span><br><span> # unfortunately Dockerfiles don't support a conditional ARG, so we need to add both DPKG + RPM</span><br><span> ADD $OSMOCOM_REPO/Release /tmp/Release</span><br><span style="color: hsl(0, 100%, 40%);">-ADD http://download.opensuse.org/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span style="color: hsl(120, 100%, 40%);">+ADD $OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span> RUN case "$DISTRO" in \</span><br><span> debian*) \</span><br><span> apt-get update && \</span><br><span>diff --git a/osmo-sip-latest/Dockerfile b/osmo-sip-latest/Dockerfile</span><br><span>index a310ecd..e6a38c0 100644</span><br><span>--- a/osmo-sip-latest/Dockerfile</span><br><span>+++ b/osmo-sip-latest/Dockerfile</span><br><span>@@ -1,10 +1,12 @@</span><br><span> ARG REGISTRY=docker.io</span><br><span> ARG UPSTREAM_DISTRO=debian:stretch</span><br><span> FROM ${REGISTRY}/${UPSTREAM_DISTRO}</span><br><span style="color: hsl(120, 100%, 40%);">+# Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_9.0/"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span>@@ -31,4 +33,4 @@</span><br><span> WORKDIR /data</span><br><span> CMD ["/bin/sh", "-c", "/usr/bin/osmo-sip-connector -c /data/osmo-sip-connector.cfg >/data/osmo-sip-connector.log 2>&1"]</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#EXPOSE </span><br><span style="color: hsl(120, 100%, 40%);">+#EXPOSE</span><br><span>diff --git a/osmo-sip-master/Dockerfile b/osmo-sip-master/Dockerfile</span><br><span>index e486979..3e387f3 100644</span><br><span>--- a/osmo-sip-master/Dockerfile</span><br><span>+++ b/osmo-sip-master/Dockerfile</span><br><span>@@ -1,12 +1,14 @@</span><br><span> ARG USER</span><br><span> ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> FROM $USER/$DISTRO-build</span><br><span> # Arguments used after FROM must be specified again</span><br><span> ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/"</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span>@@ -21,7 +23,7 @@</span><br><span> # we need to add this to invalidate the cache once the repository is updated.</span><br><span> # unfortunately Dockerfiles don't support a conditional ARG, so we need to add both DPKG + RPM</span><br><span> ADD $OSMOCOM_REPO/Release /tmp/Release</span><br><span style="color: hsl(0, 100%, 40%);">-ADD http://download.opensuse.org/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span style="color: hsl(120, 100%, 40%);">+ADD $OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span> RUN case "$DISTRO" in \</span><br><span> debian*) \</span><br><span> apt-get update && \</span><br><span>diff --git a/osmo-smlc-master/Dockerfile b/osmo-smlc-master/Dockerfile</span><br><span>index b820cf6..f39dcf7 100644</span><br><span>--- a/osmo-smlc-master/Dockerfile</span><br><span>+++ b/osmo-smlc-master/Dockerfile</span><br><span>@@ -1,12 +1,14 @@</span><br><span> ARG USER</span><br><span> ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> FROM $USER/$DISTRO-build</span><br><span> # Arguments used after FROM must be specified again</span><br><span> ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/"</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span>@@ -21,7 +23,7 @@</span><br><span> # we need to add this to invalidate the cache once the repository is updated.</span><br><span> # unfortunately Dockerfiles don't support a conditional ARG, so we need to add both DPKG + RPM</span><br><span> ADD $OSMOCOM_REPO/Release /tmp/Release</span><br><span style="color: hsl(0, 100%, 40%);">-ADD http://download.opensuse.org/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span style="color: hsl(120, 100%, 40%);">+ADD $OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span> RUN case "$DISTRO" in \</span><br><span> debian*) \</span><br><span> apt-get update && \</span><br><span>diff --git a/osmo-stp-latest/Dockerfile b/osmo-stp-latest/Dockerfile</span><br><span>index 6651c44..0d7be41 100644</span><br><span>--- a/osmo-stp-latest/Dockerfile</span><br><span>+++ b/osmo-stp-latest/Dockerfile</span><br><span>@@ -1,10 +1,12 @@</span><br><span> ARG REGISTRY=docker.io</span><br><span> ARG UPSTREAM_DISTRO=debian:stretch</span><br><span> FROM ${REGISTRY}/${UPSTREAM_DISTRO}</span><br><span style="color: hsl(120, 100%, 40%);">+# Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_9.0/"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span>diff --git a/osmo-stp-master/Dockerfile b/osmo-stp-master/Dockerfile</span><br><span>index bc3e177..63d31dc 100644</span><br><span>--- a/osmo-stp-master/Dockerfile</span><br><span>+++ b/osmo-stp-master/Dockerfile</span><br><span>@@ -1,12 +1,14 @@</span><br><span> ARG USER</span><br><span> ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> FROM $USER/$DISTRO-build</span><br><span> # Arguments used after FROM must be specified again</span><br><span> ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/"</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span>@@ -21,7 +23,7 @@</span><br><span> # we need to add this to invalidate the cache once the repository is updated.</span><br><span> # unfortunately Dockerfiles don't support a conditional ARG, so we need to add both DPKG + RPM</span><br><span> ADD $OSMOCOM_REPO/Release /tmp/Release</span><br><span style="color: hsl(0, 100%, 40%);">-ADD http://download.opensuse.org/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span style="color: hsl(120, 100%, 40%);">+ADD $OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span> RUN case "$DISTRO" in \</span><br><span> debian*) \</span><br><span> apt-get update && \</span><br><span>diff --git a/osmo-uecups-master/Dockerfile b/osmo-uecups-master/Dockerfile</span><br><span>index 777797f..de38cab 100644</span><br><span>--- a/osmo-uecups-master/Dockerfile</span><br><span>+++ b/osmo-uecups-master/Dockerfile</span><br><span>@@ -1,9 +1,11 @@</span><br><span> ARG USER</span><br><span> FROM $USER/debian-buster-build</span><br><span style="color: hsl(120, 100%, 40%);">+# Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_10/"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_10/"</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span>diff --git a/osmocom-bb-host-master/Dockerfile b/osmocom-bb-host-master/Dockerfile</span><br><span>index 4a41085..c06ff14 100644</span><br><span>--- a/osmocom-bb-host-master/Dockerfile</span><br><span>+++ b/osmocom-bb-host-master/Dockerfile</span><br><span>@@ -1,11 +1,16 @@</span><br><span> ARG USER</span><br><span style="color: hsl(0, 100%, 40%);">-FROM $USER/debian-stretch-build</span><br><span style="color: hsl(120, 100%, 40%);">+ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/$DISTRO-build</span><br><span style="color: hsl(120, 100%, 40%);">+# Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span> ARG OSMO_BB_BRANCH="master"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/"</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/21239">change 21239</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/+/21239"/><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: I8010b08f3dabacfb3c13a44eece6c7a490e0742e </div>
<div style="display:none"> Gerrit-Change-Number: 21239 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>