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/.
osmith gerrit-no-reply at lists.osmocom.orgosmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/23236 )
Change subject: debian-stretch-obs-latest: new container
......................................................................
debian-stretch-obs-latest: new container
Move common code from osmo-*-latest to debian-stretch-obs-latest:
* add the OBS repository key
* add the OBS repository with "latest" feed
* install telnet
* invalidate the cache once the repository is updated
This is in preparation to make osmo-*-latest work with centos8,
preventing the following issues we would have without this refactoring:
* avoid need to read the repository index of both debian-stretch and
centos8, and to invalidate the cache if either of them changes
(instead of just the relevant one). This is currently a problem in
osmo-*-master/Dockerfile, Id69f3eaf37f823bac0947366f27a25edd277a4cb
will fix it there.
* no need to add boilerplate code to install the centos8 repository to
each osmo-*-latest/Dockerfile
While at it, also remove deprecated MAINTAINER lines.
Related: OS#5049
Related: https://docs.docker.com/engine/reference/builder/#maintainer-deprecated
Change-Id: I443d52eba416ea298cc5421e280ad2f4ca59283b
---
A debian-stretch-obs-latest/Dockerfile
A debian-stretch-obs-latest/Makefile
R debian-stretch-obs-latest/Release.key
M jenkins-common.sh
M osmo-bsc-latest/Dockerfile
D osmo-bsc-latest/Release.key
M osmo-bts-latest/Dockerfile
M osmo-cbc-latest/Dockerfile
D osmo-cbc-latest/Release.key
M osmo-cn-latest/Dockerfile
D osmo-cn-latest/Release.key
M osmo-gbproxy-latest/Dockerfile
D osmo-gbproxy-latest/Release.key
M osmo-ggsn-latest/Dockerfile
D osmo-ggsn-latest/Release.key
M osmo-hlr-latest/Dockerfile
D osmo-hlr-latest/Release.key
M osmo-hnbgw-latest/Dockerfile
D osmo-hnbgw-latest/Release.key
M osmo-mgw-latest/Dockerfile
D osmo-mgw-latest/Release.key
M osmo-msc-latest/Dockerfile
M osmo-nitb-latest/Dockerfile
D osmo-nitb-latest/Release.key
M osmo-pcu-latest/Dockerfile
D osmo-pcu-latest/Release.key
M osmo-remsim-latest/Dockerfile
D osmo-remsim-latest/Release.key
M osmo-sgsn-latest/Dockerfile
D osmo-sgsn-latest/Release.key
M osmo-sip-latest/Dockerfile
D osmo-sip-latest/Release.key
M osmo-smlc-latest/Dockerfile
D osmo-smlc-latest/Release.key
M osmo-stp-latest/Dockerfile
D osmo-stp-latest/Release.key
36 files changed, 90 insertions(+), 659 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/36/23236/1
diff --git a/debian-stretch-obs-latest/Dockerfile b/debian-stretch-obs-latest/Dockerfile
new file mode 100644
index 0000000..3bef05c
--- /dev/null
+++ b/debian-stretch-obs-latest/Dockerfile
@@ -0,0 +1,22 @@
+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="http://download.opensuse.org"
+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"
+
+RUN apt-get update && \
+ apt-get upgrade -y && \
+ apt-get install -y --no-install-recommends \
+ telnet \
+ gnupg \
+ && \
+ apt-get clean
+
+COPY Release.key /tmp/Release.key
+RUN apt-key add /tmp/Release.key && \
+ rm /tmp/Release.key && \
+ echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list
+
+# Invalidate cache once the repository is updated
+ADD $OSMOCOM_REPO/Release /tmp/Release
diff --git a/debian-stretch-obs-latest/Makefile b/debian-stretch-obs-latest/Makefile
new file mode 100644
index 0000000..8d0e10b
--- /dev/null
+++ b/debian-stretch-obs-latest/Makefile
@@ -0,0 +1 @@
+include ../make/Makefile
diff --git a/osmo-bts-latest/Release.key b/debian-stretch-obs-latest/Release.key
similarity index 100%
rename from osmo-bts-latest/Release.key
rename to debian-stretch-obs-latest/Release.key
diff --git a/jenkins-common.sh b/jenkins-common.sh
index 25d5426..b8fc3a2 100644
--- a/jenkins-common.sh
+++ b/jenkins-common.sh
@@ -8,6 +8,7 @@
docker_depends() {
case "$1" in
osmo-*-centos8) echo "centos8-build" ;;
+ osmo-*-latest) echo "debian-stretch-obs-latest" ;;
osmo-*) echo "debian-stretch-build" ;;
ttcn3-*) echo "debian-stretch-titan" ;;
esac
diff --git a/osmo-bsc-latest/Dockerfile b/osmo-bsc-latest/Dockerfile
index d327a24..bbc3934 100644
--- a/osmo-bsc-latest/Dockerfile
+++ b/osmo-bsc-latest/Dockerfile
@@ -1,27 +1,10 @@
-ARG REGISTRY=docker.io
-ARG UPSTREAM_DISTRO=debian:stretch
-FROM ${REGISTRY}/${UPSTREAM_DISTRO}
+ARG USER
+ARG DISTRO
+FROM $USER/$DISTRO-obs-latest
# Arguments used after FROM must be specified again
-ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
-
-MAINTAINER Harald Welte <laforge at gnumonks.org>
-
-ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"
-
-COPY Release.key /tmp/Release.key
RUN apt-get update && \
apt-get install -y --no-install-recommends \
- gnupg
-
-RUN apt-key add /tmp/Release.key && \
- rm /tmp/Release.key && \
- echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list
-
-ADD $OSMOCOM_REPO/Release /tmp/Release
-RUN apt-get update && \
- apt-get install -y --no-install-recommends \
- telnet \
osmo-bsc \
osmo-bsc-ipaccess-utils && \
apt-get clean
diff --git a/osmo-bsc-latest/Release.key b/osmo-bsc-latest/Release.key
deleted file mode 100644
index a737316..0000000
--- a/osmo-bsc-latest/Release.key
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc
-a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl
-CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4
-5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee
-S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y
-CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy
-b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCXm/4
-pgIbAwUJEEzwqgYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3f/1AH
-/A7WVSpfM4wV/DMqZPTsSjChB4JyDotxpV7qHZzBC5aaP2dINZyi9PayIwZWbvCY
-VKvt+Fw8oCGC9F9mdh10Xe+ElHeVNSihzABPuu1RkRkb1nvkymScy0yxydodYOBi
-K4WQ+BhpijXWmYvOekIwbS5Hi9BHpfgK4TinK0xsvh1bVLeQJ8YjrnNFIAR2CnBa
-X7Y72Up/kKL08DdQzuS+mKrJtAQlGMtIsukWC2ajYQMkNwm8Gvhpn8za113dCkBW
-XAFnlQqQobKwC7b19QgEtJI/YpGSrRc6WaZxPyAjscbWQlFEAB900sVj4BWT55ig
-7O2uSdsCVhTuU7T0ztwsgvmIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v
-d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4=
-=/Tek
------END PGP PUBLIC KEY BLOCK-----
diff --git a/osmo-bts-latest/Dockerfile b/osmo-bts-latest/Dockerfile
index 87d1f23..b576e72 100644
--- a/osmo-bts-latest/Dockerfile
+++ b/osmo-bts-latest/Dockerfile
@@ -1,28 +1,10 @@
-ARG REGISTRY=docker.io
-ARG UPSTREAM_DISTRO=debian:stretch
-FROM ${REGISTRY}/${UPSTREAM_DISTRO}
+ARG USER
+ARG DISTRO
+FROM $USER/$DISTRO-obs-latest
# Arguments used after FROM must be specified again
-ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
-MAINTAINER Harald Welte <laforge at gnumonks.org>
-
-ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"
-
-COPY Release.key /tmp/Release.key
-
-ADD $OSMOCOM_REPO/Release /tmp/Release
RUN apt-get update && \
apt-get install -y --no-install-recommends \
- gnupg
-
-RUN apt-key add /tmp/Release.key && \
- rm /tmp/Release.key && \
- echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list
-
-ADD $OSMOCOM_REPO/Release /tmp/Release
-RUN apt-get update && \
- apt-get install -y --no-install-recommends \
- telnet \
osmo-bts-trx \
osmo-bts-virtual && \
apt-get clean
diff --git a/osmo-cbc-latest/Dockerfile b/osmo-cbc-latest/Dockerfile
index 0b87b1f..91458d8 100644
--- a/osmo-cbc-latest/Dockerfile
+++ b/osmo-cbc-latest/Dockerfile
@@ -1,28 +1,11 @@
-ARG REGISTRY=docker.io
-ARG UPSTREAM_DISTRO=debian:stretch
-FROM ${REGISTRY}/${UPSTREAM_DISTRO}
+ARG USER
+ARG DISTRO
+FROM $USER/$DISTRO-obs-latest
# Arguments used after FROM must be specified again
-ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
-
-MAINTAINER Harald Welte <laforge at gnumonks.org>
-
-ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"
-
-COPY Release.key /tmp/Release.key
RUN apt-get update && \
apt-get install -y --no-install-recommends \
- gnupg
-
-RUN apt-key add /tmp/Release.key && \
- rm /tmp/Release.key && \
- echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list
-
-ADD $OSMOCOM_REPO/Release /tmp/Release
-RUN apt-get update && \
- apt-get install -y --no-install-recommends \
- osmo-cbc \
- telnet && \
+ osmo-cbc && \
apt-get clean
WORKDIR /data
diff --git a/osmo-cbc-latest/Release.key b/osmo-cbc-latest/Release.key
deleted file mode 100644
index a737316..0000000
--- a/osmo-cbc-latest/Release.key
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc
-a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl
-CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4
-5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee
-S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y
-CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy
-b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCXm/4
-pgIbAwUJEEzwqgYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3f/1AH
-/A7WVSpfM4wV/DMqZPTsSjChB4JyDotxpV7qHZzBC5aaP2dINZyi9PayIwZWbvCY
-VKvt+Fw8oCGC9F9mdh10Xe+ElHeVNSihzABPuu1RkRkb1nvkymScy0yxydodYOBi
-K4WQ+BhpijXWmYvOekIwbS5Hi9BHpfgK4TinK0xsvh1bVLeQJ8YjrnNFIAR2CnBa
-X7Y72Up/kKL08DdQzuS+mKrJtAQlGMtIsukWC2ajYQMkNwm8Gvhpn8za113dCkBW
-XAFnlQqQobKwC7b19QgEtJI/YpGSrRc6WaZxPyAjscbWQlFEAB900sVj4BWT55ig
-7O2uSdsCVhTuU7T0ztwsgvmIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v
-d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4=
-=/Tek
------END PGP PUBLIC KEY BLOCK-----
diff --git a/osmo-cn-latest/Dockerfile b/osmo-cn-latest/Dockerfile
index b2c2a78..3da7175 100644
--- a/osmo-cn-latest/Dockerfile
+++ b/osmo-cn-latest/Dockerfile
@@ -1,28 +1,18 @@
-ARG REGISTRY=docker.io
-ARG UPSTREAM_DISTRO=debian:stretch
-FROM ${REGISTRY}/${UPSTREAM_DISTRO}
+ARG USER
+ARG DISTRO
+FROM $USER/$DISTRO-obs-latest
# Arguments used after FROM must be specified again
-ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
-
-MAINTAINER Daniel Willmann <dwillmann at sysmocom.de>
-
-ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"
-
-COPY Release.key /tmp/Release.key
RUN apt-get update && \
apt-get install -y --no-install-recommends \
- gnupg
-
-RUN apt-key add /tmp/Release.key && \
- rm /tmp/Release.key && \
- echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list
-
-ADD $OSMOCOM_REPO/Release /tmp/Release
-RUN apt-get update && \
- apt-get install -y --no-install-recommends \
- osmo-msc osmo-hlr osmo-sgsn osmo-ggsn osmo-mgw osmo-stp \
- runit telnet iptables && \
+ iptables \
+ osmo-ggsn \
+ osmo-hlr \
+ osmo-mgw \
+ osmo-msc \
+ osmo-sgsn \
+ osmo-stp \
+ runit && \
apt-get clean
WORKDIR /tmp
diff --git a/osmo-cn-latest/Release.key b/osmo-cn-latest/Release.key
deleted file mode 100644
index a737316..0000000
--- a/osmo-cn-latest/Release.key
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc
-a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl
-CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4
-5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee
-S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y
-CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy
-b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCXm/4
-pgIbAwUJEEzwqgYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3f/1AH
-/A7WVSpfM4wV/DMqZPTsSjChB4JyDotxpV7qHZzBC5aaP2dINZyi9PayIwZWbvCY
-VKvt+Fw8oCGC9F9mdh10Xe+ElHeVNSihzABPuu1RkRkb1nvkymScy0yxydodYOBi
-K4WQ+BhpijXWmYvOekIwbS5Hi9BHpfgK4TinK0xsvh1bVLeQJ8YjrnNFIAR2CnBa
-X7Y72Up/kKL08DdQzuS+mKrJtAQlGMtIsukWC2ajYQMkNwm8Gvhpn8za113dCkBW
-XAFnlQqQobKwC7b19QgEtJI/YpGSrRc6WaZxPyAjscbWQlFEAB900sVj4BWT55ig
-7O2uSdsCVhTuU7T0ztwsgvmIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v
-d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4=
-=/Tek
------END PGP PUBLIC KEY BLOCK-----
diff --git a/osmo-gbproxy-latest/Dockerfile b/osmo-gbproxy-latest/Dockerfile
index 1e53113..22904a1 100644
--- a/osmo-gbproxy-latest/Dockerfile
+++ b/osmo-gbproxy-latest/Dockerfile
@@ -1,45 +1,19 @@
-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="http://download.opensuse.org"
+ARG USER
ARG DISTRO
+FROM $USER/$DISTRO-obs-latest
+# Arguments used after FROM must be specified again
-MAINTAINER Harald Welte <laforge at gnumonks.org>
-
-ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"
-
-COPY Release.key /tmp/Release.key
-
-RUN apt-get update && \
- apt-get install -y --no-install-recommends \
- gnupg
-
-RUN case "$DISTRO" in \
- debian*) \
- apt-key add /tmp/Release.key && \
- rm /tmp/Release.key && \
- echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list \
- ;; \
- esac
-
-# 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 $OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/CentOS_8/repodata/repomd.xml /tmp/repomd.xml
RUN case "$DISTRO" in \
debian*) \
apt-get update && \
apt-get install -y --no-install-recommends \
osmo-gbproxy \
- telnet \
&& \
apt-get clean \
;; \
centos*) \
dnf install -y \
osmo-gbproxy \
- telnet \
;; \
*) \
echo "Unsupported distribution $DISTRO" \
diff --git a/osmo-gbproxy-latest/Release.key b/osmo-gbproxy-latest/Release.key
deleted file mode 100644
index a737316..0000000
--- a/osmo-gbproxy-latest/Release.key
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc
-a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl
-CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4
-5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee
-S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y
-CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy
-b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCXm/4
-pgIbAwUJEEzwqgYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3f/1AH
-/A7WVSpfM4wV/DMqZPTsSjChB4JyDotxpV7qHZzBC5aaP2dINZyi9PayIwZWbvCY
-VKvt+Fw8oCGC9F9mdh10Xe+ElHeVNSihzABPuu1RkRkb1nvkymScy0yxydodYOBi
-K4WQ+BhpijXWmYvOekIwbS5Hi9BHpfgK4TinK0xsvh1bVLeQJ8YjrnNFIAR2CnBa
-X7Y72Up/kKL08DdQzuS+mKrJtAQlGMtIsukWC2ajYQMkNwm8Gvhpn8za113dCkBW
-XAFnlQqQobKwC7b19QgEtJI/YpGSrRc6WaZxPyAjscbWQlFEAB900sVj4BWT55ig
-7O2uSdsCVhTuU7T0ztwsgvmIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v
-d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4=
-=/Tek
------END PGP PUBLIC KEY BLOCK-----
diff --git a/osmo-ggsn-latest/Dockerfile b/osmo-ggsn-latest/Dockerfile
index 7729bfc..82bbef2 100644
--- a/osmo-ggsn-latest/Dockerfile
+++ b/osmo-ggsn-latest/Dockerfile
@@ -1,24 +1,8 @@
-ARG REGISTRY=docker.io
-ARG UPSTREAM_DISTRO=debian:stretch
-FROM ${REGISTRY}/${UPSTREAM_DISTRO}
+ARG USER
+ARG DISTRO
+FROM $USER/$DISTRO-obs-latest
# Arguments used after FROM must be specified again
-ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
-MAINTAINER Harald Welte <laforge at gnumonks.org>
-
-ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"
-
-COPY Release.key /tmp/Release.key
-
-RUN apt-get update && \
- apt-get install -y --no-install-recommends \
- gnupg
-
-RUN apt-key add /tmp/Release.key && \
- rm /tmp/Release.key && \
- echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list
-
-ADD $OSMOCOM_REPO/Release /tmp/Release
# Disable update-initramfs to save time during apt-get install
RUN ln -s /bin/true /usr/local/bin/update-initramfs && \
apt-get update && \
@@ -38,8 +22,7 @@
make \
osmo-ggsn \
pax-utils \
- qemu-system-x86 \
- telnet && \
+ qemu-system-x86 && \
apt-get clean
WORKDIR /tmp
diff --git a/osmo-ggsn-latest/Release.key b/osmo-ggsn-latest/Release.key
deleted file mode 100644
index a737316..0000000
--- a/osmo-ggsn-latest/Release.key
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc
-a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl
-CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4
-5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee
-S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y
-CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy
-b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCXm/4
-pgIbAwUJEEzwqgYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3f/1AH
-/A7WVSpfM4wV/DMqZPTsSjChB4JyDotxpV7qHZzBC5aaP2dINZyi9PayIwZWbvCY
-VKvt+Fw8oCGC9F9mdh10Xe+ElHeVNSihzABPuu1RkRkb1nvkymScy0yxydodYOBi
-K4WQ+BhpijXWmYvOekIwbS5Hi9BHpfgK4TinK0xsvh1bVLeQJ8YjrnNFIAR2CnBa
-X7Y72Up/kKL08DdQzuS+mKrJtAQlGMtIsukWC2ajYQMkNwm8Gvhpn8za113dCkBW
-XAFnlQqQobKwC7b19QgEtJI/YpGSrRc6WaZxPyAjscbWQlFEAB900sVj4BWT55ig
-7O2uSdsCVhTuU7T0ztwsgvmIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v
-d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4=
-=/Tek
------END PGP PUBLIC KEY BLOCK-----
diff --git a/osmo-hlr-latest/Dockerfile b/osmo-hlr-latest/Dockerfile
index 9468634..ed83ac3 100644
--- a/osmo-hlr-latest/Dockerfile
+++ b/osmo-hlr-latest/Dockerfile
@@ -1,29 +1,12 @@
-ARG REGISTRY=docker.io
-ARG UPSTREAM_DISTRO=debian:stretch
-FROM ${REGISTRY}/${UPSTREAM_DISTRO}
+ARG USER
+ARG DISTRO
+FROM $USER/$DISTRO-obs-latest
# Arguments used after FROM must be specified again
-ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
-MAINTAINER Harald Welte <laforge at gnumonks.org>
-
-ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"
-
-COPY Release.key /tmp/Release.key
-
-RUN apt-get update && \
- apt-get install -y --no-install-recommends \
- gnupg
-
-RUN apt-key add /tmp/Release.key && \
- rm /tmp/Release.key && \
- echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list
-
-ADD $OSMOCOM_REPO/Release /tmp/Release
RUN apt-get update && \
apt-get install -y --no-install-recommends \
libdbd-sqlite3 \
- osmo-hlr \
- telnet && \
+ osmo-hlr && \
apt-get clean
WORKDIR /tmp
diff --git a/osmo-hlr-latest/Release.key b/osmo-hlr-latest/Release.key
deleted file mode 100644
index a737316..0000000
--- a/osmo-hlr-latest/Release.key
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc
-a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl
-CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4
-5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee
-S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y
-CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy
-b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCXm/4
-pgIbAwUJEEzwqgYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3f/1AH
-/A7WVSpfM4wV/DMqZPTsSjChB4JyDotxpV7qHZzBC5aaP2dINZyi9PayIwZWbvCY
-VKvt+Fw8oCGC9F9mdh10Xe+ElHeVNSihzABPuu1RkRkb1nvkymScy0yxydodYOBi
-K4WQ+BhpijXWmYvOekIwbS5Hi9BHpfgK4TinK0xsvh1bVLeQJ8YjrnNFIAR2CnBa
-X7Y72Up/kKL08DdQzuS+mKrJtAQlGMtIsukWC2ajYQMkNwm8Gvhpn8za113dCkBW
-XAFnlQqQobKwC7b19QgEtJI/YpGSrRc6WaZxPyAjscbWQlFEAB900sVj4BWT55ig
-7O2uSdsCVhTuU7T0ztwsgvmIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v
-d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4=
-=/Tek
------END PGP PUBLIC KEY BLOCK-----
diff --git a/osmo-hnbgw-latest/Dockerfile b/osmo-hnbgw-latest/Dockerfile
index 33f9808..81fdead 100644
--- a/osmo-hnbgw-latest/Dockerfile
+++ b/osmo-hnbgw-latest/Dockerfile
@@ -1,27 +1,10 @@
-ARG REGISTRY=docker.io
-ARG UPSTREAM_DISTRO=debian:stretch
-FROM ${REGISTRY}/${UPSTREAM_DISTRO}
+ARG USER
+ARG DISTRO
+FROM $USER/$DISTRO-obs-latest
# Arguments used after FROM must be specified again
-ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
-
-MAINTAINER Harald Welte <laforge at gnumonks.org>
-
-ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"
-
-COPY Release.key /tmp/Release.key
RUN apt-get update && \
apt-get install -y --no-install-recommends \
- gnupg
-
-RUN apt-key add /tmp/Release.key && \
- rm /tmp/Release.key && \
- echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list
-
-ADD $OSMOCOM_REPO/Release /tmp/Release
-RUN apt-get update && \
- apt-get install -y --no-install-recommends \
- telnet \
osmo-hnbgw && \
apt-get clean
diff --git a/osmo-hnbgw-latest/Release.key b/osmo-hnbgw-latest/Release.key
deleted file mode 100644
index a737316..0000000
--- a/osmo-hnbgw-latest/Release.key
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc
-a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl
-CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4
-5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee
-S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y
-CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy
-b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCXm/4
-pgIbAwUJEEzwqgYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3f/1AH
-/A7WVSpfM4wV/DMqZPTsSjChB4JyDotxpV7qHZzBC5aaP2dINZyi9PayIwZWbvCY
-VKvt+Fw8oCGC9F9mdh10Xe+ElHeVNSihzABPuu1RkRkb1nvkymScy0yxydodYOBi
-K4WQ+BhpijXWmYvOekIwbS5Hi9BHpfgK4TinK0xsvh1bVLeQJ8YjrnNFIAR2CnBa
-X7Y72Up/kKL08DdQzuS+mKrJtAQlGMtIsukWC2ajYQMkNwm8Gvhpn8za113dCkBW
-XAFnlQqQobKwC7b19QgEtJI/YpGSrRc6WaZxPyAjscbWQlFEAB900sVj4BWT55ig
-7O2uSdsCVhTuU7T0ztwsgvmIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v
-d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4=
-=/Tek
------END PGP PUBLIC KEY BLOCK-----
diff --git a/osmo-mgw-latest/Dockerfile b/osmo-mgw-latest/Dockerfile
index 4e81a72..52cca6e 100644
--- a/osmo-mgw-latest/Dockerfile
+++ b/osmo-mgw-latest/Dockerfile
@@ -1,27 +1,10 @@
-ARG REGISTRY=docker.io
-ARG UPSTREAM_DISTRO=debian:stretch
-FROM ${REGISTRY}/${UPSTREAM_DISTRO}
+ARG USER
+ARG DISTRO
+FROM $USER/$DISTRO-obs-latest
# Arguments used after FROM must be specified again
-ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
-
-MAINTAINER Harald Welte <laforge at gnumonks.org>
-
-ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"
-
-COPY Release.key /tmp/Release.key
RUN apt-get update && \
apt-get install -y --no-install-recommends \
- gnupg
-
-RUN apt-key add /tmp/Release.key && \
- rm /tmp/Release.key && \
- echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list
-
-ADD $OSMOCOM_REPO/Release /tmp/Release
-RUN apt-get update && \
- apt-get install -y --no-install-recommends \
- telnet \
osmo-mgw && \
apt-get clean
diff --git a/osmo-mgw-latest/Release.key b/osmo-mgw-latest/Release.key
deleted file mode 100644
index a737316..0000000
--- a/osmo-mgw-latest/Release.key
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc
-a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl
-CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4
-5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee
-S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y
-CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy
-b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCXm/4
-pgIbAwUJEEzwqgYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3f/1AH
-/A7WVSpfM4wV/DMqZPTsSjChB4JyDotxpV7qHZzBC5aaP2dINZyi9PayIwZWbvCY
-VKvt+Fw8oCGC9F9mdh10Xe+ElHeVNSihzABPuu1RkRkb1nvkymScy0yxydodYOBi
-K4WQ+BhpijXWmYvOekIwbS5Hi9BHpfgK4TinK0xsvh1bVLeQJ8YjrnNFIAR2CnBa
-X7Y72Up/kKL08DdQzuS+mKrJtAQlGMtIsukWC2ajYQMkNwm8Gvhpn8za113dCkBW
-XAFnlQqQobKwC7b19QgEtJI/YpGSrRc6WaZxPyAjscbWQlFEAB900sVj4BWT55ig
-7O2uSdsCVhTuU7T0ztwsgvmIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v
-d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4=
-=/Tek
------END PGP PUBLIC KEY BLOCK-----
diff --git a/osmo-msc-latest/Dockerfile b/osmo-msc-latest/Dockerfile
index f1710d0..4ff86d3 100644
--- a/osmo-msc-latest/Dockerfile
+++ b/osmo-msc-latest/Dockerfile
@@ -1,28 +1,11 @@
-ARG REGISTRY=docker.io
-ARG UPSTREAM_DISTRO=debian:stretch
-FROM ${REGISTRY}/${UPSTREAM_DISTRO}
+ARG USER
+ARG DISTRO
+FROM $USER/$DISTRO-obs-latest
# Arguments used after FROM must be specified again
-ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
-
-MAINTAINER Harald Welte <laforge at gnumonks.org>
-
-ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"
-
-COPY Release.key /tmp/Release.key
RUN apt-get update && \
apt-get install -y --no-install-recommends \
- gnupg
-
-RUN apt-key add /tmp/Release.key && \
- rm /tmp/Release.key && \
- echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list
-
-ADD $OSMOCOM_REPO/Release /tmp/Release
-RUN apt-get update && \
- apt-get install -y --no-install-recommends \
- osmo-msc \
- telnet && \
+ osmo-msc && \
apt-get clean
WORKDIR /tmp
diff --git a/osmo-nitb-latest/Dockerfile b/osmo-nitb-latest/Dockerfile
index aae7f84..c711f8d 100644
--- a/osmo-nitb-latest/Dockerfile
+++ b/osmo-nitb-latest/Dockerfile
@@ -1,24 +1,8 @@
-ARG REGISTRY=docker.io
-ARG UPSTREAM_DISTRO=debian:stretch
-FROM ${REGISTRY}/${UPSTREAM_DISTRO}
+ARG USER
+ARG DISTRO
+FROM $USER/$DISTRO-obs-latest
# Arguments used after FROM must be specified again
-ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
-MAINTAINER Harald Welte <laforge at gnumonks.org>
-
-ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"
-
-COPY Release.key /tmp/Release.key
-
-RUN apt-get update && \
- apt-get install -y --no-install-recommends \
- gnupg
-
-RUN apt-key add /tmp/Release.key && \
- rm /tmp/Release.key && \
- echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list
-
-ADD $OSMOCOM_REPO/Release /tmp/Release
RUN apt-get update && \
apt-get install -y --no-install-recommends \
osmocom-nitb \
diff --git a/osmo-nitb-latest/Release.key b/osmo-nitb-latest/Release.key
deleted file mode 100644
index a737316..0000000
--- a/osmo-nitb-latest/Release.key
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc
-a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl
-CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4
-5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee
-S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y
-CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy
-b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCXm/4
-pgIbAwUJEEzwqgYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3f/1AH
-/A7WVSpfM4wV/DMqZPTsSjChB4JyDotxpV7qHZzBC5aaP2dINZyi9PayIwZWbvCY
-VKvt+Fw8oCGC9F9mdh10Xe+ElHeVNSihzABPuu1RkRkb1nvkymScy0yxydodYOBi
-K4WQ+BhpijXWmYvOekIwbS5Hi9BHpfgK4TinK0xsvh1bVLeQJ8YjrnNFIAR2CnBa
-X7Y72Up/kKL08DdQzuS+mKrJtAQlGMtIsukWC2ajYQMkNwm8Gvhpn8za113dCkBW
-XAFnlQqQobKwC7b19QgEtJI/YpGSrRc6WaZxPyAjscbWQlFEAB900sVj4BWT55ig
-7O2uSdsCVhTuU7T0ztwsgvmIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v
-d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4=
-=/Tek
------END PGP PUBLIC KEY BLOCK-----
diff --git a/osmo-pcu-latest/Dockerfile b/osmo-pcu-latest/Dockerfile
index c259d3c..4714bf2 100644
--- a/osmo-pcu-latest/Dockerfile
+++ b/osmo-pcu-latest/Dockerfile
@@ -1,28 +1,10 @@
-ARG REGISTRY=docker.io
-ARG UPSTREAM_DISTRO=debian:stretch
-FROM ${REGISTRY}/${UPSTREAM_DISTRO}
+ARG USER
+ARG DISTRO
+FROM $USER/$DISTRO-obs-latest
# Arguments used after FROM must be specified again
-ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
-MAINTAINER Harald Welte <laforge at gnumonks.org>
-
-ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"
-
-COPY Release.key /tmp/Release.key
-
-ADD $OSMOCOM_REPO/Release /tmp/Release
RUN apt-get update && \
apt-get install -y --no-install-recommends \
- gnupg
-
-RUN apt-key add /tmp/Release.key && \
- rm /tmp/Release.key && \
- echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list
-
-ADD $OSMOCOM_REPO/Release /tmp/Release
-RUN apt-get update && \
- apt-get install -y --no-install-recommends \
- telnet \
osmo-pcu && \
apt-get clean
diff --git a/osmo-pcu-latest/Release.key b/osmo-pcu-latest/Release.key
deleted file mode 100644
index a737316..0000000
--- a/osmo-pcu-latest/Release.key
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc
-a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl
-CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4
-5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee
-S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y
-CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy
-b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCXm/4
-pgIbAwUJEEzwqgYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3f/1AH
-/A7WVSpfM4wV/DMqZPTsSjChB4JyDotxpV7qHZzBC5aaP2dINZyi9PayIwZWbvCY
-VKvt+Fw8oCGC9F9mdh10Xe+ElHeVNSihzABPuu1RkRkb1nvkymScy0yxydodYOBi
-K4WQ+BhpijXWmYvOekIwbS5Hi9BHpfgK4TinK0xsvh1bVLeQJ8YjrnNFIAR2CnBa
-X7Y72Up/kKL08DdQzuS+mKrJtAQlGMtIsukWC2ajYQMkNwm8Gvhpn8za113dCkBW
-XAFnlQqQobKwC7b19QgEtJI/YpGSrRc6WaZxPyAjscbWQlFEAB900sVj4BWT55ig
-7O2uSdsCVhTuU7T0ztwsgvmIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v
-d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4=
-=/Tek
------END PGP PUBLIC KEY BLOCK-----
diff --git a/osmo-remsim-latest/Dockerfile b/osmo-remsim-latest/Dockerfile
index 56ae863..db1aa05 100644
--- a/osmo-remsim-latest/Dockerfile
+++ b/osmo-remsim-latest/Dockerfile
@@ -1,28 +1,10 @@
-ARG REGISTRY=docker.io
-ARG UPSTREAM_DISTRO=debian:stretch
-FROM ${REGISTRY}/${UPSTREAM_DISTRO}
+ARG USER
+ARG DISTRO
+FROM $USER/$DISTRO-obs-latest
# Arguments used after FROM must be specified again
-ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
-MAINTAINER Harald Welte <laforge at gnumonks.org>
-
-ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"
-
-COPY Release.key /tmp/Release.key
-
-ADD $OSMOCOM_REPO/Release /tmp/Release
RUN apt-get update && \
apt-get install -y --no-install-recommends \
- gnupg
-
-RUN apt-key add /tmp/Release.key && \
- rm /tmp/Release.key && \
- echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list
-
-ADD $OSMOCOM_REPO/Release /tmp/Release
-RUN apt-get update && \
- apt-get install -y --no-install-recommends \
- telnet \
osmo-remsim-server \
osmo-remsim-client \
osmo-remsim-bankd && \
diff --git a/osmo-remsim-latest/Release.key b/osmo-remsim-latest/Release.key
deleted file mode 100644
index a737316..0000000
--- a/osmo-remsim-latest/Release.key
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc
-a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl
-CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4
-5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee
-S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y
-CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy
-b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCXm/4
-pgIbAwUJEEzwqgYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3f/1AH
-/A7WVSpfM4wV/DMqZPTsSjChB4JyDotxpV7qHZzBC5aaP2dINZyi9PayIwZWbvCY
-VKvt+Fw8oCGC9F9mdh10Xe+ElHeVNSihzABPuu1RkRkb1nvkymScy0yxydodYOBi
-K4WQ+BhpijXWmYvOekIwbS5Hi9BHpfgK4TinK0xsvh1bVLeQJ8YjrnNFIAR2CnBa
-X7Y72Up/kKL08DdQzuS+mKrJtAQlGMtIsukWC2ajYQMkNwm8Gvhpn8za113dCkBW
-XAFnlQqQobKwC7b19QgEtJI/YpGSrRc6WaZxPyAjscbWQlFEAB900sVj4BWT55ig
-7O2uSdsCVhTuU7T0ztwsgvmIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v
-d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4=
-=/Tek
------END PGP PUBLIC KEY BLOCK-----
diff --git a/osmo-sgsn-latest/Dockerfile b/osmo-sgsn-latest/Dockerfile
index 324b1be..c3b1410 100644
--- a/osmo-sgsn-latest/Dockerfile
+++ b/osmo-sgsn-latest/Dockerfile
@@ -1,27 +1,10 @@
-ARG REGISTRY=docker.io
-ARG UPSTREAM_DISTRO=debian:stretch
-FROM ${REGISTRY}/${UPSTREAM_DISTRO}
+ARG USER
+ARG DISTRO
+FROM $USER/$DISTRO-obs-latest
# Arguments used after FROM must be specified again
-ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
-
-MAINTAINER Harald Welte <laforge at gnumonks.org>
-
-ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"
-
-COPY Release.key /tmp/Release.key
RUN apt-get update && \
apt-get install -y --no-install-recommends \
- gnupg
-
-RUN apt-key add /tmp/Release.key && \
- rm /tmp/Release.key && \
- echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list
-
-ADD $OSMOCOM_REPO/Release /tmp/Release
-RUN apt-get update && \
- apt-get install -y --no-install-recommends \
- telnet \
osmo-sgsn && \
apt-get clean
diff --git a/osmo-sgsn-latest/Release.key b/osmo-sgsn-latest/Release.key
deleted file mode 100644
index a737316..0000000
--- a/osmo-sgsn-latest/Release.key
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc
-a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl
-CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4
-5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee
-S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y
-CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy
-b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCXm/4
-pgIbAwUJEEzwqgYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3f/1AH
-/A7WVSpfM4wV/DMqZPTsSjChB4JyDotxpV7qHZzBC5aaP2dINZyi9PayIwZWbvCY
-VKvt+Fw8oCGC9F9mdh10Xe+ElHeVNSihzABPuu1RkRkb1nvkymScy0yxydodYOBi
-K4WQ+BhpijXWmYvOekIwbS5Hi9BHpfgK4TinK0xsvh1bVLeQJ8YjrnNFIAR2CnBa
-X7Y72Up/kKL08DdQzuS+mKrJtAQlGMtIsukWC2ajYQMkNwm8Gvhpn8za113dCkBW
-XAFnlQqQobKwC7b19QgEtJI/YpGSrRc6WaZxPyAjscbWQlFEAB900sVj4BWT55ig
-7O2uSdsCVhTuU7T0ztwsgvmIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v
-d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4=
-=/Tek
------END PGP PUBLIC KEY BLOCK-----
diff --git a/osmo-sip-latest/Dockerfile b/osmo-sip-latest/Dockerfile
index 7b3bc2c..79dbf55 100644
--- a/osmo-sip-latest/Dockerfile
+++ b/osmo-sip-latest/Dockerfile
@@ -1,28 +1,11 @@
-ARG REGISTRY=docker.io
-ARG UPSTREAM_DISTRO=debian:stretch
-FROM ${REGISTRY}/${UPSTREAM_DISTRO}
+ARG USER
+ARG DISTRO
+FROM $USER/$DISTRO-obs-latest
# Arguments used after FROM must be specified again
-ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
-
-MAINTAINER Harald Welte <laforge at gnumonks.org>
-
-ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"
-
-COPY Release.key /tmp/Release.key
RUN apt-get update && \
apt-get install -y --no-install-recommends \
- gnupg
-
-RUN apt-key add /tmp/Release.key && \
- rm /tmp/Release.key && \
- echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list
-
-ADD $OSMOCOM_REPO/Release /tmp/Release
-RUN apt-get update && \
- apt-get install -y --no-install-recommends \
- osmo-sip-connector \
- telnet && \
+ osmo-sip-connector && \
apt-get clean
WORKDIR /tmp
diff --git a/osmo-sip-latest/Release.key b/osmo-sip-latest/Release.key
deleted file mode 100644
index a737316..0000000
--- a/osmo-sip-latest/Release.key
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc
-a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl
-CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4
-5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee
-S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y
-CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy
-b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCXm/4
-pgIbAwUJEEzwqgYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3f/1AH
-/A7WVSpfM4wV/DMqZPTsSjChB4JyDotxpV7qHZzBC5aaP2dINZyi9PayIwZWbvCY
-VKvt+Fw8oCGC9F9mdh10Xe+ElHeVNSihzABPuu1RkRkb1nvkymScy0yxydodYOBi
-K4WQ+BhpijXWmYvOekIwbS5Hi9BHpfgK4TinK0xsvh1bVLeQJ8YjrnNFIAR2CnBa
-X7Y72Up/kKL08DdQzuS+mKrJtAQlGMtIsukWC2ajYQMkNwm8Gvhpn8za113dCkBW
-XAFnlQqQobKwC7b19QgEtJI/YpGSrRc6WaZxPyAjscbWQlFEAB900sVj4BWT55ig
-7O2uSdsCVhTuU7T0ztwsgvmIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v
-d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4=
-=/Tek
------END PGP PUBLIC KEY BLOCK-----
diff --git a/osmo-smlc-latest/Dockerfile b/osmo-smlc-latest/Dockerfile
index d367ee4..51e290a 100644
--- a/osmo-smlc-latest/Dockerfile
+++ b/osmo-smlc-latest/Dockerfile
@@ -1,28 +1,11 @@
-ARG REGISTRY=docker.io
-ARG UPSTREAM_DISTRO=debian:stretch
-FROM ${REGISTRY}/${UPSTREAM_DISTRO}
+ARG USER
+ARG DISTRO
+FROM $USER/$DISTRO-obs-latest
# Arguments used after FROM must be specified again
-ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
-
-MAINTAINER Harald Welte <laforge at gnumonks.org>
-
-ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"
-
-COPY Release.key /tmp/Release.key
RUN apt-get update && \
apt-get install -y --no-install-recommends \
- gnupg
-
-RUN apt-key add /tmp/Release.key && \
- rm /tmp/Release.key && \
- echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list
-
-ADD $OSMOCOM_REPO/Release /tmp/Release
-RUN apt-get update && \
- apt-get install -y --no-install-recommends \
- osmo-smlc \
- telnet && \
+ osmo-smlc && \
apt-get clean
WORKDIR /data
diff --git a/osmo-smlc-latest/Release.key b/osmo-smlc-latest/Release.key
deleted file mode 100644
index a737316..0000000
--- a/osmo-smlc-latest/Release.key
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc
-a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl
-CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4
-5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee
-S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y
-CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy
-b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCXm/4
-pgIbAwUJEEzwqgYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3f/1AH
-/A7WVSpfM4wV/DMqZPTsSjChB4JyDotxpV7qHZzBC5aaP2dINZyi9PayIwZWbvCY
-VKvt+Fw8oCGC9F9mdh10Xe+ElHeVNSihzABPuu1RkRkb1nvkymScy0yxydodYOBi
-K4WQ+BhpijXWmYvOekIwbS5Hi9BHpfgK4TinK0xsvh1bVLeQJ8YjrnNFIAR2CnBa
-X7Y72Up/kKL08DdQzuS+mKrJtAQlGMtIsukWC2ajYQMkNwm8Gvhpn8za113dCkBW
-XAFnlQqQobKwC7b19QgEtJI/YpGSrRc6WaZxPyAjscbWQlFEAB900sVj4BWT55ig
-7O2uSdsCVhTuU7T0ztwsgvmIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v
-d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4=
-=/Tek
------END PGP PUBLIC KEY BLOCK-----
diff --git a/osmo-stp-latest/Dockerfile b/osmo-stp-latest/Dockerfile
index 1a55ee8..c139af4 100644
--- a/osmo-stp-latest/Dockerfile
+++ b/osmo-stp-latest/Dockerfile
@@ -1,28 +1,11 @@
-ARG REGISTRY=docker.io
-ARG UPSTREAM_DISTRO=debian:stretch
-FROM ${REGISTRY}/${UPSTREAM_DISTRO}
+ARG USER
+ARG DISTRO
+FROM $USER/$DISTRO-obs-latest
# Arguments used after FROM must be specified again
-ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
-
-MAINTAINER Harald Welte <laforge at gnumonks.org>
-
-ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"
-
-COPY Release.key /tmp/Release.key
RUN apt-get update && \
apt-get install -y --no-install-recommends \
- gnupg
-
-RUN apt-key add /tmp/Release.key && \
- rm /tmp/Release.key && \
- echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list
-
-ADD $OSMOCOM_REPO/Release /tmp/Release
-RUN apt-get update && \
- apt-get install -y --no-install-recommends \
- osmo-stp \
- telnet && \
+ osmo-stp && \
apt-get clean
WORKDIR /data
diff --git a/osmo-stp-latest/Release.key b/osmo-stp-latest/Release.key
deleted file mode 100644
index a737316..0000000
--- a/osmo-stp-latest/Release.key
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc
-a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl
-CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4
-5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee
-S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y
-CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy
-b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCXm/4
-pgIbAwUJEEzwqgYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3f/1AH
-/A7WVSpfM4wV/DMqZPTsSjChB4JyDotxpV7qHZzBC5aaP2dINZyi9PayIwZWbvCY
-VKvt+Fw8oCGC9F9mdh10Xe+ElHeVNSihzABPuu1RkRkb1nvkymScy0yxydodYOBi
-K4WQ+BhpijXWmYvOekIwbS5Hi9BHpfgK4TinK0xsvh1bVLeQJ8YjrnNFIAR2CnBa
-X7Y72Up/kKL08DdQzuS+mKrJtAQlGMtIsukWC2ajYQMkNwm8Gvhpn8za113dCkBW
-XAFnlQqQobKwC7b19QgEtJI/YpGSrRc6WaZxPyAjscbWQlFEAB900sVj4BWT55ig
-7O2uSdsCVhTuU7T0ztwsgvmIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v
-d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4=
-=/Tek
------END PGP PUBLIC KEY BLOCK-----
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23236
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I443d52eba416ea298cc5421e280ad2f4ca59283b
Gerrit-Change-Number: 23236
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210304/26821633/attachment.htm>