diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2021-03-03 13:59:03 +0100 |
|---|---|---|
| committer | Oliver Smith <osmith@sysmocom.de> | 2021-03-04 14:39:46 +0100 |
| commit | effdb1a452f1e42d6834d77c504dd90ad3854562 (patch) | |
| tree | 47df7c7decc411500c10960dae1c2010a4bb1f51 /osmo-sgsn-latest | |
| parent | 46797c80adf11211cd3ff97885f34bd44c86635a (diff) | |
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
Diffstat (limited to 'osmo-sgsn-latest')
| -rw-r--r-- | osmo-sgsn-latest/Dockerfile | 23 | ||||
| -rw-r--r-- | osmo-sgsn-latest/Release.key | 20 |
2 files changed, 3 insertions, 40 deletions
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@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----- |