From 31daedcd2bd4bba80f37479b3099fc67f6b25605 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Thu, 4 Mar 2021 12:34:00 +0100 Subject: [PATCH] osmo-*-master: move common code to *-build Move common code from osmo-*-master to debian-stretch-build and centos8-build: * add the OBS repository key (debian only) * add the OBS repository with "nightly" feed (debian only, already done for centos8) * install telnet * invalidate the cache once the repository is updated While at it, remove deprecated MAINTAINER lines. This fixes the need to read both the repository index of debian-stretch and centos8 and having to invalidate the cache if either of them changes (instead of reading just the relevant index and invalidating the cache only if the relevant one changes). A similar change was done with osmo-*-latest in I443d52eba416ea298cc5421e280ad2f4ca59283b. Related: OS#5049 Related: https://docs.docker.com/engine/reference/builder/#maintainer-deprecated Change-Id: Id69f3eaf37f823bac0947366f27a25edd277a4cb --- centos8-build/Dockerfile | 7 +++++- debian-stretch-build/Dockerfile | 14 +++++++++-- .../Release.key | 0 osmo-bsc-master/Dockerfile | 21 ---------------- osmo-bts-master/Dockerfile | 22 ----------------- osmo-bts-master/Release.key | 20 ---------------- osmo-cbc-master/Dockerfile | 21 ---------------- osmo-cbc-master/Release.key | 20 ---------------- osmo-gbproxy-master/Dockerfile | 21 ---------------- osmo-gbproxy-master/Release.key | 20 ---------------- osmo-ggsn-master/Dockerfile | 24 +------------------ osmo-ggsn-master/Release.key | 20 ---------------- osmo-hlr-master/Dockerfile | 24 +------------------ osmo-hlr-master/Release.key | 20 ---------------- osmo-hnbgw-master/Dockerfile | 18 +------------- osmo-hnbgw-master/Release.key | 20 ---------------- osmo-mgw-master/Dockerfile | 22 ----------------- osmo-mgw-master/Release.key | 20 ---------------- osmo-msc-master/Dockerfile | 24 +------------------ osmo-msc-master/Release.key | 20 ---------------- osmo-nitb-master/Dockerfile | 17 ------------- osmo-nitb-master/Release.key | 20 ---------------- osmo-pcu-master/Dockerfile | 22 ----------------- osmo-pcu-master/Release.key | 20 ---------------- osmo-remsim-master/Dockerfile | 23 ------------------ osmo-remsim-master/Release.key | 20 ---------------- osmo-sgsn-master/Dockerfile | 22 ----------------- osmo-sgsn-master/Release.key | 20 ---------------- osmo-sip-master/Dockerfile | 21 ---------------- osmo-sip-master/Release.key | 20 ---------------- osmo-smlc-master/Dockerfile | 21 ---------------- osmo-smlc-master/Release.key | 20 ---------------- osmo-stp-master/Dockerfile | 22 ----------------- osmo-stp-master/Release.key | 20 ---------------- osmo-uecups-master/Dockerfile | 16 +++---------- osmo-uecups-master/Release.key | 20 ---------------- 36 files changed, 25 insertions(+), 677 deletions(-) rename {osmo-bsc-master => debian-stretch-build}/Release.key (100%) delete mode 100644 osmo-bts-master/Release.key delete mode 100644 osmo-cbc-master/Release.key delete mode 100644 osmo-gbproxy-master/Release.key delete mode 100644 osmo-ggsn-master/Release.key delete mode 100644 osmo-hlr-master/Release.key delete mode 100644 osmo-hnbgw-master/Release.key delete mode 100644 osmo-mgw-master/Release.key delete mode 100644 osmo-msc-master/Release.key delete mode 100644 osmo-nitb-master/Release.key delete mode 100644 osmo-pcu-master/Release.key delete mode 100644 osmo-remsim-master/Release.key delete mode 100644 osmo-sgsn-master/Release.key delete mode 100644 osmo-sip-master/Release.key delete mode 100644 osmo-smlc-master/Release.key delete mode 100644 osmo-stp-master/Release.key delete mode 100644 osmo-uecups-master/Release.key diff --git a/centos8-build/Dockerfile b/centos8-build/Dockerfile index 1130f349..412816ce 100644 --- a/centos8-build/Dockerfile +++ b/centos8-build/Dockerfile @@ -1,6 +1,7 @@ ARG REGISTRY=docker.io ARG UPSTREAM_DISTRO=centos:centos8 FROM ${REGISTRY}/${UPSTREAM_DISTRO} +# Arguments used after FROM must be specified again ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" # Let package metadata expire after 60 seconds instead of 48 hours @@ -46,4 +47,8 @@ RUN dnf install -y \ pkg-config \ readline-devel \ sqlite \ - sqlite-devel + sqlite-devel \ + telnet + +# Invalidate cache once the repository is updated +ADD $OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/CentOS_8/repodata/repomd.xml /tmp/repomd.xml diff --git a/debian-stretch-build/Dockerfile b/debian-stretch-build/Dockerfile index 96e92de3..a98fa3e6 100644 --- a/debian-stretch-build/Dockerfile +++ b/debian-stretch-build/Dockerfile @@ -1,8 +1,9 @@ ARG REGISTRY=docker.io ARG UPSTREAM_DISTRO=debian:stretch FROM ${REGISTRY}/${UPSTREAM_DISTRO} - -MAINTAINER Harald Welte +# 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:/nightly/Debian_9.0/" RUN apt-get update && \ apt-get upgrade -y && \ @@ -53,5 +54,14 @@ RUN apt-get update && \ pkg-config \ sqlite3 \ stow \ + telnet \ wget && \ 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-nightly.list + +# Invalidate cache once the repository is updated +ADD $OSMOCOM_REPO/Release /tmp/Release diff --git a/osmo-bsc-master/Release.key b/debian-stretch-build/Release.key similarity index 100% rename from osmo-bsc-master/Release.key rename to debian-stretch-build/Release.key diff --git a/osmo-bsc-master/Dockerfile b/osmo-bsc-master/Dockerfile index 1c0b04a8..32ded302 100644 --- a/osmo-bsc-master/Dockerfile +++ b/osmo-bsc-master/Dockerfile @@ -1,34 +1,13 @@ ARG USER ARG DISTRO -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" FROM $USER/$DISTRO-build # Arguments used after FROM must be specified again ARG DISTRO -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" -MAINTAINER Harald Welte - -ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/" - -COPY Release.key /tmp/Release.key - -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-nightly.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:/nightly/CentOS_8/repodata/repomd.xml /tmp/repomd.xml RUN case "$DISTRO" in \ debian*) \ apt-get update && \ apt-get install -y --no-install-recommends \ - telnet \ libosmocore-dev \ libosmo-abis-dev \ libosmo-netif-dev \ diff --git a/osmo-bts-master/Dockerfile b/osmo-bts-master/Dockerfile index 4699b2b6..13df6280 100644 --- a/osmo-bts-master/Dockerfile +++ b/osmo-bts-master/Dockerfile @@ -1,34 +1,13 @@ ARG USER ARG DISTRO -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" FROM $USER/$DISTRO-build # Arguments used after FROM must be specified again ARG DISTRO -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" -MAINTAINER Harald Welte - -ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/" - -COPY Release.key /tmp/Release.key - -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-nightly.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:/nightly/CentOS_8/repodata/repomd.xml /tmp/repomd.xml RUN case "$DISTRO" in \ debian*) \ apt-get update && \ apt-get install -y --no-install-recommends \ - telnet \ libosmocore-dev \ libosmo-abis-dev \ libosmo-netif-dev \ @@ -48,7 +27,6 @@ RUN case "$DISTRO" in \ "pkgconfig(libosmogsm)" \ "pkgconfig(libosmotrau)" \ "pkgconfig(libosmovty)" \ - telnet \ ;; \ esac diff --git a/osmo-bts-master/Release.key b/osmo-bts-master/Release.key deleted file mode 100644 index a737316d..00000000 --- a/osmo-bts-master/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-cbc-master/Dockerfile b/osmo-cbc-master/Dockerfile index c305ac4a..7b2811f8 100644 --- a/osmo-cbc-master/Dockerfile +++ b/osmo-cbc-master/Dockerfile @@ -1,34 +1,13 @@ ARG USER ARG DISTRO -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" FROM $USER/$DISTRO-build # Arguments used after FROM must be specified again ARG DISTRO -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" -MAINTAINER Harald Welte - -ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/" - -COPY Release.key /tmp/Release.key - -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-nightly.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:/nightly/CentOS_8/repodata/repomd.xml /tmp/repomd.xml RUN case "$DISTRO" in \ debian*) \ apt-get update && \ apt-get install -y --no-install-recommends \ - telnet \ libosmocore-dev \ libosmo-netif-dev \ libulfius-dev \ diff --git a/osmo-cbc-master/Release.key b/osmo-cbc-master/Release.key deleted file mode 100644 index a737316d..00000000 --- a/osmo-cbc-master/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-master/Dockerfile b/osmo-gbproxy-master/Dockerfile index 9df1ee7a..61463c52 100644 --- a/osmo-gbproxy-master/Dockerfile +++ b/osmo-gbproxy-master/Dockerfile @@ -3,31 +3,11 @@ ARG DISTRO FROM $USER/$DISTRO-build # Arguments used after FROM must be specified again ARG DISTRO -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" -MAINTAINER Harald Welte - -ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/" - -COPY Release.key /tmp/Release.key - -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-nightly.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:/nightly/CentOS_8/repodata/repomd.xml /tmp/repomd.xml RUN case "$DISTRO" in \ debian*) \ apt-get update && \ apt-get install -y --no-install-recommends \ - telnet \ libosmocore-dev \ libosmo-abis-dev \ libosmo-netif-dev \ @@ -36,7 +16,6 @@ RUN case "$DISTRO" in \ ;; \ centos*) \ dnf install -y \ - telnet \ "pkgconfig(libosmo-netif)" \ "pkgconfig(libosmoabis)" \ "pkgconfig(libosmocore)" \ diff --git a/osmo-gbproxy-master/Release.key b/osmo-gbproxy-master/Release.key deleted file mode 100644 index a737316d..00000000 --- a/osmo-gbproxy-master/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-master/Dockerfile b/osmo-ggsn-master/Dockerfile index 72dcafe5..c3afb684 100644 --- a/osmo-ggsn-master/Dockerfile +++ b/osmo-ggsn-master/Dockerfile @@ -1,29 +1,9 @@ ARG USER ARG DISTRO -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" FROM $USER/$DISTRO-build # Arguments used after FROM must be specified again ARG DISTRO -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" -MAINTAINER Harald Welte - -ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/" - -COPY Release.key /tmp/Release.key - -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-nightly.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:/nightly/CentOS_8/repodata/repomd.xml /tmp/repomd.xml # Disable update-initramfs to save time during apt-get install RUN case "$DISTRO" in \ debian*) \ @@ -39,13 +19,11 @@ RUN case "$DISTRO" in \ libosmocore-dev \ linux-image-amd64 \ pax-utils \ - qemu-system-x86 \ - telnet && \ + qemu-system-x86 && \ apt-get clean \ ;; \ centos*) \ dnf install -y \ - telnet \ "pkgconfig(libgtpnl)" \ "pkgconfig(libmnl)" \ "pkgconfig(libosmocore)" \ diff --git a/osmo-ggsn-master/Release.key b/osmo-ggsn-master/Release.key deleted file mode 100644 index a737316d..00000000 --- a/osmo-ggsn-master/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-master/Dockerfile b/osmo-hlr-master/Dockerfile index 2f7a1656..9ddc1934 100644 --- a/osmo-hlr-master/Dockerfile +++ b/osmo-hlr-master/Dockerfile @@ -1,29 +1,9 @@ ARG USER ARG DISTRO -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" FROM $USER/$DISTRO-build # Arguments used after FROM must be specified again ARG DISTRO -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" -MAINTAINER Harald Welte - -ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/" - -COPY Release.key /tmp/Release.key - -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-nightly.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:/nightly/CentOS_8/repodata/repomd.xml /tmp/repomd.xml RUN case "$DISTRO" in \ debian*) \ apt-get update && \ @@ -32,8 +12,7 @@ RUN case "$DISTRO" in \ libosmo-abis-dev \ libosmo-netif-dev \ libosmo-sigtran-dev \ - libosmocore-dev \ - telnet && \ + libosmocore-dev && \ apt-get clean \ ;; \ centos*) \ @@ -44,7 +23,6 @@ RUN case "$DISTRO" in \ "pkgconfig(libosmogsm)" \ "pkgconfig(libosmovty)" \ python3 \ - telnet \ ;; \ esac diff --git a/osmo-hlr-master/Release.key b/osmo-hlr-master/Release.key deleted file mode 100644 index a737316d..00000000 --- a/osmo-hlr-master/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-master/Dockerfile b/osmo-hnbgw-master/Dockerfile index ed354312..9101e0cc 100644 --- a/osmo-hnbgw-master/Dockerfile +++ b/osmo-hnbgw-master/Dockerfile @@ -1,27 +1,11 @@ ARG USER ARG DISTRO -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" FROM $USER/$DISTRO-build # Arguments used after FROM must be specified again -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" +ARG DISTRO -MAINTAINER Harald Welte - -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 && \ - echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list - -# 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:/nightly/CentOS_8/repodata/repomd.xml /tmp/repomd.xml RUN apt-get update && \ apt-get install -y --no-install-recommends \ - telnet \ libosmocore-dev \ libosmo-abis-dev \ libosmo-netif-dev \ diff --git a/osmo-hnbgw-master/Release.key b/osmo-hnbgw-master/Release.key deleted file mode 100644 index a737316d..00000000 --- a/osmo-hnbgw-master/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-master/Dockerfile b/osmo-mgw-master/Dockerfile index 02337ca8..dea49515 100644 --- a/osmo-mgw-master/Dockerfile +++ b/osmo-mgw-master/Dockerfile @@ -1,34 +1,13 @@ ARG USER ARG DISTRO -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" FROM $USER/$DISTRO-build # Arguments used after FROM must be specified again ARG DISTRO -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" -MAINTAINER Harald Welte - -ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/" - -COPY Release.key /tmp/Release.key - -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-nightly.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:/nightly/CentOS_8/repodata/repomd.xml /tmp/repomd.xml RUN case "$DISTRO" in \ debian*) \ apt-get update && \ apt-get install -y --no-install-recommends \ - telnet \ libosmocore-dev \ libosmo-abis-dev \ libosmo-netif-dev \ @@ -37,7 +16,6 @@ RUN case "$DISTRO" in \ ;; \ centos*) \ dnf install -y \ - telnet \ "pkgconfig(libosmo-netif)" \ "pkgconfig(libosmocore)" \ "pkgconfig(libosmoctrl)" \ diff --git a/osmo-mgw-master/Release.key b/osmo-mgw-master/Release.key deleted file mode 100644 index a737316d..00000000 --- a/osmo-mgw-master/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-master/Dockerfile b/osmo-msc-master/Dockerfile index 7f9e6f5d..1ad46842 100644 --- a/osmo-msc-master/Dockerfile +++ b/osmo-msc-master/Dockerfile @@ -1,29 +1,9 @@ ARG USER ARG DISTRO -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" FROM $USER/$DISTRO-build # Arguments used after FROM must be specified again ARG DISTRO -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" -MAINTAINER Harald Welte - -ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/" - -COPY Release.key /tmp/Release.key - -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-nightly.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:/nightly/CentOS_8/repodata/repomd.xml /tmp/repomd.xml RUN case "$DISTRO" in \ debian*) \ apt-get update && \ @@ -39,13 +19,11 @@ RUN case "$DISTRO" in \ libosmo-sccp-dev \ libosmo-sigtran-dev \ libosmocore-dev \ - libsmpp34-dev \ - telnet && \ + libsmpp34-dev && \ apt-get clean \ ;; \ centos*) \ dnf install -y \ - telnet \ "pkgconfig(libasn1c)" \ "pkgconfig(libosmo-gsup-client)" \ "pkgconfig(libosmo-mgcp-client)" \ diff --git a/osmo-msc-master/Release.key b/osmo-msc-master/Release.key deleted file mode 100644 index a737316d..00000000 --- a/osmo-msc-master/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-nitb-master/Dockerfile b/osmo-nitb-master/Dockerfile index c0d34058..43a8d22e 100644 --- a/osmo-nitb-master/Dockerfile +++ b/osmo-nitb-master/Dockerfile @@ -1,28 +1,11 @@ ARG USER ARG DISTRO -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" FROM $USER/$DISTRO-build # Arguments used after FROM must be specified again ARG DISTRO -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" -MAINTAINER Harald Welte - -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 && \ - echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list - -# 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:/nightly/CentOS_8/repodata/repomd.xml /tmp/repomd.xml RUN apt-get update && \ apt-get install -y --no-install-recommends \ - telnet \ libosmocore-dev \ libosmo-abis-dev \ libosmo-netif-dev \ diff --git a/osmo-nitb-master/Release.key b/osmo-nitb-master/Release.key deleted file mode 100644 index a737316d..00000000 --- a/osmo-nitb-master/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-master/Dockerfile b/osmo-pcu-master/Dockerfile index 0d07522e..f8e6ded5 100644 --- a/osmo-pcu-master/Dockerfile +++ b/osmo-pcu-master/Dockerfile @@ -1,40 +1,18 @@ ARG USER ARG DISTRO -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" FROM $USER/$DISTRO-build # Arguments used after FROM must be specified again ARG DISTRO -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" -MAINTAINER Harald Welte - -ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/" - -COPY Release.key /tmp/Release.key - -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-nightly.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:/nightly/CentOS_8/repodata/repomd.xml /tmp/repomd.xml RUN case "$DISTRO" in \ debian*) \ apt-get update && \ apt-get install -y --no-install-recommends \ - telnet \ libosmocore-dev && \ apt-get clean \ ;; \ centos*) \ dnf install -y \ - telnet \ "pkgconfig(libosmocore)" \ "pkgconfig(libosmogb)" \ "pkgconfig(libosmogsm)" \ diff --git a/osmo-pcu-master/Release.key b/osmo-pcu-master/Release.key deleted file mode 100644 index a737316d..00000000 --- a/osmo-pcu-master/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-master/Dockerfile b/osmo-remsim-master/Dockerfile index 45425376..6ebc40db 100644 --- a/osmo-remsim-master/Dockerfile +++ b/osmo-remsim-master/Dockerfile @@ -1,12 +1,8 @@ ARG USER ARG DISTRO -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" FROM $USER/$DISTRO-build # Arguments used after FROM must be specified again ARG DISTRO -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" - -MAINTAINER Harald Welte # PC/SC required for testing of bankd (with vpcd) # autoconf, automake, libtool, pkg-config, m4, help2man required for virtualsmartcard @@ -32,28 +28,10 @@ RUN case "$DISTRO" in \ RUN git clone https://github.com/frankmorgner/vsmartcard.git RUN cd vsmartcard/virtualsmartcard && autoreconf -fi && ./configure && make "-j$(nproc)" install - -ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/" - -COPY Release.key /tmp/Release.key - -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-nightly.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:/nightly/CentOS_8/repodata/repomd.xml /tmp/repomd.xml RUN case "$DISTRO" in \ debian*) \ apt-get update && \ apt-get install -y --no-install-recommends \ - telnet \ libosmocore-dev \ libosmo-simtrace2-dev \ libosmo-abis-dev \ @@ -67,7 +45,6 @@ RUN case "$DISTRO" in \ ;; \ centos*) \ dnf install -y \ - telnet \ "pkgconfig(libasn1c)" \ "pkgconfig(libosmoabis)" \ "pkgconfig(libosmocore)" \ diff --git a/osmo-remsim-master/Release.key b/osmo-remsim-master/Release.key deleted file mode 100644 index a737316d..00000000 --- a/osmo-remsim-master/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-master/Dockerfile b/osmo-sgsn-master/Dockerfile index fb25f849..55d96953 100644 --- a/osmo-sgsn-master/Dockerfile +++ b/osmo-sgsn-master/Dockerfile @@ -1,34 +1,13 @@ ARG USER ARG DISTRO -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" FROM $USER/$DISTRO-build # Arguments used after FROM must be specified again ARG DISTRO -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" -MAINTAINER Harald Welte - -ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/" - -COPY Release.key /tmp/Release.key - -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-nightly.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:/nightly/CentOS_8/repodata/repomd.xml /tmp/repomd.xml RUN case "$DISTRO" in \ debian*) \ apt-get update && \ apt-get install -y --no-install-recommends \ - telnet \ libosmocore-dev \ libosmo-abis-dev \ libosmo-gsup-client-dev \ @@ -43,7 +22,6 @@ RUN case "$DISTRO" in \ ;; \ centos*) \ dnf install -y \ - telnet \ "pkgconfig(libasn1c)" \ "pkgconfig(libcrypto)" \ "pkgconfig(libgtp)" \ diff --git a/osmo-sgsn-master/Release.key b/osmo-sgsn-master/Release.key deleted file mode 100644 index a737316d..00000000 --- a/osmo-sgsn-master/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-master/Dockerfile b/osmo-sip-master/Dockerfile index 064432e1..3261a55a 100644 --- a/osmo-sip-master/Dockerfile +++ b/osmo-sip-master/Dockerfile @@ -1,29 +1,9 @@ ARG USER ARG DISTRO -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" FROM $USER/$DISTRO-build # Arguments used after FROM must be specified again ARG DISTRO -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" -MAINTAINER Harald Welte - -ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/" - -COPY Release.key /tmp/Release.key - -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-nightly.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:/nightly/CentOS_8/repodata/repomd.xml /tmp/repomd.xml RUN case "$DISTRO" in \ debian*) \ apt-get update && \ @@ -38,7 +18,6 @@ RUN case "$DISTRO" in \ "pkgconfig(libosmogsm)" \ "pkgconfig(libosmovty)" \ "pkgconfig(sofia-sip-ua-glib)" \ - telnet \ ;; \ esac diff --git a/osmo-sip-master/Release.key b/osmo-sip-master/Release.key deleted file mode 100644 index a737316d..00000000 --- a/osmo-sip-master/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-master/Dockerfile b/osmo-smlc-master/Dockerfile index 38cd41bc..b814f7ac 100644 --- a/osmo-smlc-master/Dockerfile +++ b/osmo-smlc-master/Dockerfile @@ -1,34 +1,13 @@ ARG USER ARG DISTRO -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" FROM $USER/$DISTRO-build # Arguments used after FROM must be specified again ARG DISTRO -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" -MAINTAINER Harald Welte - -ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/" - -COPY Release.key /tmp/Release.key - -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-nightly.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:/nightly/CentOS_8/repodata/repomd.xml /tmp/repomd.xml RUN case "$DISTRO" in \ debian*) \ apt-get update && \ apt-get install -y --no-install-recommends \ - telnet \ libosmocore-dev \ libosmo-netif-dev \ libosmo-sccp-dev \ diff --git a/osmo-smlc-master/Release.key b/osmo-smlc-master/Release.key deleted file mode 100644 index a737316d..00000000 --- a/osmo-smlc-master/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-master/Dockerfile b/osmo-stp-master/Dockerfile index 39363bcf..7061e893 100644 --- a/osmo-stp-master/Dockerfile +++ b/osmo-stp-master/Dockerfile @@ -1,41 +1,19 @@ ARG USER ARG DISTRO -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" FROM $USER/$DISTRO-build # Arguments used after FROM must be specified again ARG DISTRO -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" -MAINTAINER Harald Welte - -ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/" - -COPY Release.key /tmp/Release.key - -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-nightly.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:/nightly/CentOS_8/repodata/repomd.xml /tmp/repomd.xml RUN case "$DISTRO" in \ debian*) \ apt-get update && \ apt-get install -y --no-install-recommends \ - telnet \ libosmocore-dev \ libosmo-netif-dev && \ apt-get clean \ ;; \ centos*) \ dnf install -y \ - telnet \ "pkgconfig(libosmo-netif)" \ "pkgconfig(libosmocore)" \ "pkgconfig(libosmogsm)" \ diff --git a/osmo-stp-master/Release.key b/osmo-stp-master/Release.key deleted file mode 100644 index a737316d..00000000 --- a/osmo-stp-master/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-uecups-master/Dockerfile b/osmo-uecups-master/Dockerfile index fb86563a..deaedc7e 100644 --- a/osmo-uecups-master/Dockerfile +++ b/osmo-uecups-master/Dockerfile @@ -1,19 +1,9 @@ ARG USER -FROM $USER/debian-buster-build +ARG DISTRO +FROM $USER/$DISTRO-build # Arguments used after FROM must be specified again -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" +ARG DISTRO -MAINTAINER Harald Welte - -ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_10/" - -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-nightly.list - -ADD $OSMOCOM_REPO/Release /tmp/Release RUN apt-get update && \ apt-get install -y --no-install-recommends \ libjansson-dev \ diff --git a/osmo-uecups-master/Release.key b/osmo-uecups-master/Release.key deleted file mode 100644 index a737316d..00000000 --- a/osmo-uecups-master/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-----