diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2021-03-04 12:34:00 +0100 |
|---|---|---|
| committer | Oliver Smith <osmith@sysmocom.de> | 2021-03-04 14:45:51 +0100 |
| commit | 31daedcd2bd4bba80f37479b3099fc67f6b25605 (patch) | |
| tree | fdb92e118703cfd1a3c759f6bbd76db2a251684d /osmo-mgw-master | |
| parent | 69b3ecb912ab61dfb404857baa1534bb0b117e75 (diff) | |
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
Diffstat (limited to 'osmo-mgw-master')
| -rw-r--r-- | osmo-mgw-master/Dockerfile | 22 | ||||
| -rw-r--r-- | osmo-mgw-master/Release.key | 20 |
2 files changed, 0 insertions, 42 deletions
diff --git a/osmo-mgw-master/Dockerfile b/osmo-mgw-master/Dockerfile index 02337ca..dea4951 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 <laforge@gnumonks.org> - -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 a737316..0000000 --- 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----- |