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