<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/23237">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-*-latest: support centos8<br><br>Add a new centos8-obs-latest container with shared code (just like<br>debian-stretch-obs-latest) and adjust the package install blocks in<br>osmo-*-latest.<br><br>Related: OS#5049<br>Change-Id: I274b31d4903df07e99fd434af25bdb72991f6923<br>---<br>A centos8-obs-latest/Dockerfile<br>A centos8-obs-latest/Makefile<br>M jenkins-common.sh<br>M osmo-bsc-latest/Dockerfile<br>M osmo-bts-latest/Dockerfile<br>M osmo-cbc-latest/Dockerfile<br>M osmo-gbproxy-latest/Dockerfile<br>M osmo-ggsn-latest/Dockerfile<br>M osmo-hlr-latest/Dockerfile<br>M osmo-mgw-latest/Dockerfile<br>M osmo-msc-latest/Dockerfile<br>M osmo-nitb-latest/Dockerfile<br>M osmo-pcu-latest/Dockerfile<br>M osmo-sgsn-latest/Dockerfile<br>M osmo-sip-latest/Dockerfile<br>M osmo-smlc-latest/Dockerfile<br>M osmo-stp-latest/Dockerfile<br>17 files changed, 205 insertions(+), 67 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/37/23237/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/centos8-obs-latest/Dockerfile b/centos8-obs-latest/Dockerfile</span><br><span>new file mode 100644</span><br><span>index 0000000..4b2357b</span><br><span>--- /dev/null</span><br><span>+++ b/centos8-obs-latest/Dockerfile</span><br><span>@@ -0,0 +1,21 @@</span><br><span style="color: hsl(120, 100%, 40%);">+ARG REGISTRY=docker.io</span><br><span style="color: hsl(120, 100%, 40%);">+ARG UPSTREAM_DISTRO=centos:centos8</span><br><span style="color: hsl(120, 100%, 40%);">+FROM ${REGISTRY}/${UPSTREAM_DISTRO}</span><br><span style="color: hsl(120, 100%, 40%);">+# Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Let package metadata expire after 60 seconds instead of 48 hours</span><br><span style="color: hsl(120, 100%, 40%);">+RUN echo "metadata_expire=60" >> /etc/dnf/dnf.conf && cat /etc/dnf/dnf.conf</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Make additional development libraries available from PowerTools and set up</span><br><span style="color: hsl(120, 100%, 40%);">+# Osmocom latest OBS repository</span><br><span style="color: hsl(120, 100%, 40%);">+RUN dnf install -y dnf-utils wget && \</span><br><span style="color: hsl(120, 100%, 40%);">+ yum config-manager --set-enabled powertools && \</span><br><span style="color: hsl(120, 100%, 40%);">+ cd /etc/yum.repos.d/ && \</span><br><span style="color: hsl(120, 100%, 40%);">+ wget $OSMOCOM_REPO_MIRROR/repositories/network:osmocom:latest/CentOS_8/network:osmocom:latest.repo</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+RUN dnf install -y \</span><br><span style="color: hsl(120, 100%, 40%);">+ telnet</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Invalidate cache once the repository is updated</span><br><span style="color: hsl(120, 100%, 40%);">+ADD $OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/CentOS_8/repodata/repomd.xml /tmp/repomd.xml</span><br><span>diff --git a/centos8-obs-latest/Makefile b/centos8-obs-latest/Makefile</span><br><span>new file mode 100644</span><br><span>index 0000000..cba5cee</span><br><span>--- /dev/null</span><br><span>+++ b/centos8-obs-latest/Makefile</span><br><span>@@ -0,0 +1,3 @@</span><br><span style="color: hsl(120, 100%, 40%);">+UPSTREAM_DISTRO:=centos:centos8</span><br><span style="color: hsl(120, 100%, 40%);">+DISTRO:=centos8</span><br><span style="color: hsl(120, 100%, 40%);">+include ../make/Makefile</span><br><span>diff --git a/jenkins-common.sh b/jenkins-common.sh</span><br><span>index b8fc3a2..6c27fae 100644</span><br><span>--- a/jenkins-common.sh</span><br><span>+++ b/jenkins-common.sh</span><br><span>@@ -7,6 +7,7 @@</span><br><span> </span><br><span> docker_depends() {</span><br><span> case "$1" in</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-*-latest-centos8) echo "centos8-obs-latest" ;;</span><br><span> osmo-*-centos8) echo "centos8-build" ;;</span><br><span> osmo-*-latest) echo "debian-stretch-obs-latest" ;;</span><br><span> osmo-*) echo "debian-stretch-build" ;;</span><br><span>diff --git a/osmo-bsc-latest/Dockerfile b/osmo-bsc-latest/Dockerfile</span><br><span>index bbc3934..3352ed2 100644</span><br><span>--- a/osmo-bsc-latest/Dockerfile</span><br><span>+++ b/osmo-bsc-latest/Dockerfile</span><br><span>@@ -2,12 +2,22 @@</span><br><span> ARG DISTRO</span><br><span> FROM $USER/$DISTRO-obs-latest</span><br><span> # Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG DISTRO</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN apt-get update && \</span><br><span style="color: hsl(0, 100%, 40%);">- apt-get install -y --no-install-recommends \</span><br><span style="color: hsl(0, 100%, 40%);">- osmo-bsc \</span><br><span style="color: hsl(0, 100%, 40%);">- osmo-bsc-ipaccess-utils && \</span><br><span style="color: hsl(0, 100%, 40%);">- apt-get clean</span><br><span style="color: hsl(120, 100%, 40%);">+RUN case "$DISTRO" in \</span><br><span style="color: hsl(120, 100%, 40%);">+ debian*) \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get update && \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get install -y --no-install-recommends \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-bsc \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-bsc-ipaccess-utils && \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get clean \</span><br><span style="color: hsl(120, 100%, 40%);">+ ;; \</span><br><span style="color: hsl(120, 100%, 40%);">+ centos*) \</span><br><span style="color: hsl(120, 100%, 40%);">+ dnf install -y \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-bsc \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-bsc-ipaccess-utils \</span><br><span style="color: hsl(120, 100%, 40%);">+ ;; \</span><br><span style="color: hsl(120, 100%, 40%);">+ esac</span><br><span> </span><br><span> WORKDIR /tmp</span><br><span> </span><br><span>diff --git a/osmo-bts-latest/Dockerfile b/osmo-bts-latest/Dockerfile</span><br><span>index b576e72..6e835d5 100644</span><br><span>--- a/osmo-bts-latest/Dockerfile</span><br><span>+++ b/osmo-bts-latest/Dockerfile</span><br><span>@@ -2,12 +2,22 @@</span><br><span> ARG DISTRO</span><br><span> FROM $USER/$DISTRO-obs-latest</span><br><span> # Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG DISTRO</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN apt-get update && \</span><br><span style="color: hsl(0, 100%, 40%);">- apt-get install -y --no-install-recommends \</span><br><span style="color: hsl(0, 100%, 40%);">- osmo-bts-trx \</span><br><span style="color: hsl(0, 100%, 40%);">- osmo-bts-virtual && \</span><br><span style="color: hsl(0, 100%, 40%);">- apt-get clean</span><br><span style="color: hsl(120, 100%, 40%);">+RUN case "$DISTRO" in \</span><br><span style="color: hsl(120, 100%, 40%);">+ debian*) \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get update && \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get install -y --no-install-recommends \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-bts-trx \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-bts-virtual && \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get clean \</span><br><span style="color: hsl(120, 100%, 40%);">+ ;; \</span><br><span style="color: hsl(120, 100%, 40%);">+ centos*) \</span><br><span style="color: hsl(120, 100%, 40%);">+ dnf install -y \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-bts \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-bts-virtual \</span><br><span style="color: hsl(120, 100%, 40%);">+ ;; \</span><br><span style="color: hsl(120, 100%, 40%);">+ esac</span><br><span> </span><br><span> ADD respawn.sh /usr/local/bin/respawn.sh</span><br><span> </span><br><span>diff --git a/osmo-cbc-latest/Dockerfile b/osmo-cbc-latest/Dockerfile</span><br><span>index 91458d8..d919dae 100644</span><br><span>--- a/osmo-cbc-latest/Dockerfile</span><br><span>+++ b/osmo-cbc-latest/Dockerfile</span><br><span>@@ -2,11 +2,20 @@</span><br><span> ARG DISTRO</span><br><span> FROM $USER/$DISTRO-obs-latest</span><br><span> # Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG DISTRO</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN apt-get update && \</span><br><span style="color: hsl(0, 100%, 40%);">- apt-get install -y --no-install-recommends \</span><br><span style="color: hsl(0, 100%, 40%);">- osmo-cbc && \</span><br><span style="color: hsl(0, 100%, 40%);">- apt-get clean</span><br><span style="color: hsl(120, 100%, 40%);">+RUN case "$DISTRO" in \</span><br><span style="color: hsl(120, 100%, 40%);">+ debian*) \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get update && \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get install -y --no-install-recommends \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-cbc && \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get clean \</span><br><span style="color: hsl(120, 100%, 40%);">+ ;; \</span><br><span style="color: hsl(120, 100%, 40%);">+ centos*) \</span><br><span style="color: hsl(120, 100%, 40%);">+ dnf install -y \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-cbc \</span><br><span style="color: hsl(120, 100%, 40%);">+ ;; \</span><br><span style="color: hsl(120, 100%, 40%);">+ esac</span><br><span> </span><br><span> WORKDIR /data</span><br><span> </span><br><span>diff --git a/osmo-gbproxy-latest/Dockerfile b/osmo-gbproxy-latest/Dockerfile</span><br><span>index 22904a1..7c729a5 100644</span><br><span>--- a/osmo-gbproxy-latest/Dockerfile</span><br><span>+++ b/osmo-gbproxy-latest/Dockerfile</span><br><span>@@ -2,6 +2,7 @@</span><br><span> ARG DISTRO</span><br><span> FROM $USER/$DISTRO-obs-latest</span><br><span> # Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG DISTRO</span><br><span> </span><br><span> RUN case "$DISTRO" in \</span><br><span> debian*) \</span><br><span>diff --git a/osmo-ggsn-latest/Dockerfile b/osmo-ggsn-latest/Dockerfile</span><br><span>index 82bbef2..0da9703 100644</span><br><span>--- a/osmo-ggsn-latest/Dockerfile</span><br><span>+++ b/osmo-ggsn-latest/Dockerfile</span><br><span>@@ -2,28 +2,38 @@</span><br><span> ARG DISTRO</span><br><span> FROM $USER/$DISTRO-obs-latest</span><br><span> # Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG DISTRO</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# Install additional debian depends for kernel module test (OS#3208)</span><br><span> # Disable update-initramfs to save time during apt-get install</span><br><span style="color: hsl(0, 100%, 40%);">-RUN ln -s /bin/true /usr/local/bin/update-initramfs && \</span><br><span style="color: hsl(0, 100%, 40%);">- apt-get update && \</span><br><span style="color: hsl(0, 100%, 40%);">- apt-get install -y --no-install-recommends \</span><br><span style="color: hsl(0, 100%, 40%);">- bc \</span><br><span style="color: hsl(0, 100%, 40%);">- bison \</span><br><span style="color: hsl(0, 100%, 40%);">- bridge-utils \</span><br><span style="color: hsl(0, 100%, 40%);">- busybox-static \</span><br><span style="color: hsl(0, 100%, 40%);">- ca-certificates \</span><br><span style="color: hsl(0, 100%, 40%);">- flex \</span><br><span style="color: hsl(0, 100%, 40%);">- gcc \</span><br><span style="color: hsl(0, 100%, 40%);">- git \</span><br><span style="color: hsl(0, 100%, 40%);">- libc6-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libelf-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libssl-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- linux-image-amd64 \</span><br><span style="color: hsl(0, 100%, 40%);">- make \</span><br><span style="color: hsl(0, 100%, 40%);">- osmo-ggsn \</span><br><span style="color: hsl(0, 100%, 40%);">- pax-utils \</span><br><span style="color: hsl(0, 100%, 40%);">- qemu-system-x86 && \</span><br><span style="color: hsl(0, 100%, 40%);">- apt-get clean</span><br><span style="color: hsl(120, 100%, 40%);">+RUN case "$DISTRO" in \</span><br><span style="color: hsl(120, 100%, 40%);">+ debian*) \</span><br><span style="color: hsl(120, 100%, 40%);">+ ln -s /bin/true /usr/local/bin/update-initramfs && \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get update && \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get install -y --no-install-recommends \</span><br><span style="color: hsl(120, 100%, 40%);">+ bc \</span><br><span style="color: hsl(120, 100%, 40%);">+ bison \</span><br><span style="color: hsl(120, 100%, 40%);">+ bridge-utils \</span><br><span style="color: hsl(120, 100%, 40%);">+ busybox-static \</span><br><span style="color: hsl(120, 100%, 40%);">+ ca-certificates \</span><br><span style="color: hsl(120, 100%, 40%);">+ flex \</span><br><span style="color: hsl(120, 100%, 40%);">+ gcc \</span><br><span style="color: hsl(120, 100%, 40%);">+ git \</span><br><span style="color: hsl(120, 100%, 40%);">+ libc6-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libelf-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libssl-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ linux-image-amd64 \</span><br><span style="color: hsl(120, 100%, 40%);">+ make \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-ggsn \</span><br><span style="color: hsl(120, 100%, 40%);">+ pax-utils \</span><br><span style="color: hsl(120, 100%, 40%);">+ qemu-system-x86 && \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get clean \</span><br><span style="color: hsl(120, 100%, 40%);">+ ;; \</span><br><span style="color: hsl(120, 100%, 40%);">+ centos*) \</span><br><span style="color: hsl(120, 100%, 40%);">+ dnf install -y \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-ggsn \</span><br><span style="color: hsl(120, 100%, 40%);">+ ;; \</span><br><span style="color: hsl(120, 100%, 40%);">+ esac</span><br><span> </span><br><span> WORKDIR /tmp</span><br><span> </span><br><span>diff --git a/osmo-hlr-latest/Dockerfile b/osmo-hlr-latest/Dockerfile</span><br><span>index ed83ac3..ece7aa6 100644</span><br><span>--- a/osmo-hlr-latest/Dockerfile</span><br><span>+++ b/osmo-hlr-latest/Dockerfile</span><br><span>@@ -2,12 +2,21 @@</span><br><span> ARG DISTRO</span><br><span> FROM $USER/$DISTRO-obs-latest</span><br><span> # Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG DISTRO</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN apt-get update && \</span><br><span style="color: hsl(0, 100%, 40%);">- apt-get install -y --no-install-recommends \</span><br><span style="color: hsl(0, 100%, 40%);">- libdbd-sqlite3 \</span><br><span style="color: hsl(0, 100%, 40%);">- osmo-hlr && \</span><br><span style="color: hsl(0, 100%, 40%);">- apt-get clean</span><br><span style="color: hsl(120, 100%, 40%);">+RUN case "$DISTRO" in \</span><br><span style="color: hsl(120, 100%, 40%);">+ debian*) \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get update && \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get install -y --no-install-recommends \</span><br><span style="color: hsl(120, 100%, 40%);">+ libdbd-sqlite3 \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-hlr && \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get clean \</span><br><span style="color: hsl(120, 100%, 40%);">+ ;; \</span><br><span style="color: hsl(120, 100%, 40%);">+ centos*) \</span><br><span style="color: hsl(120, 100%, 40%);">+ dnf install -y \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-hlr \</span><br><span style="color: hsl(120, 100%, 40%);">+ ;; \</span><br><span style="color: hsl(120, 100%, 40%);">+ esac</span><br><span> </span><br><span> WORKDIR /tmp</span><br><span> </span><br><span>diff --git a/osmo-mgw-latest/Dockerfile b/osmo-mgw-latest/Dockerfile</span><br><span>index 52cca6e..5b01fe8 100644</span><br><span>--- a/osmo-mgw-latest/Dockerfile</span><br><span>+++ b/osmo-mgw-latest/Dockerfile</span><br><span>@@ -2,11 +2,20 @@</span><br><span> ARG DISTRO</span><br><span> FROM $USER/$DISTRO-obs-latest</span><br><span> # Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG DISTRO</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN apt-get update && \</span><br><span style="color: hsl(0, 100%, 40%);">- apt-get install -y --no-install-recommends \</span><br><span style="color: hsl(0, 100%, 40%);">- osmo-mgw && \</span><br><span style="color: hsl(0, 100%, 40%);">- apt-get clean</span><br><span style="color: hsl(120, 100%, 40%);">+RUN case "$DISTRO" in \</span><br><span style="color: hsl(120, 100%, 40%);">+ debian*) \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get update && \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get install -y --no-install-recommends \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-mgw && \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get clean \</span><br><span style="color: hsl(120, 100%, 40%);">+ ;; \</span><br><span style="color: hsl(120, 100%, 40%);">+ centos*) \</span><br><span style="color: hsl(120, 100%, 40%);">+ dnf install -y \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-mgw \</span><br><span style="color: hsl(120, 100%, 40%);">+ ;; \</span><br><span style="color: hsl(120, 100%, 40%);">+ esac</span><br><span> </span><br><span> WORKDIR /tmp</span><br><span> </span><br><span>diff --git a/osmo-msc-latest/Dockerfile b/osmo-msc-latest/Dockerfile</span><br><span>index 4ff86d3..d2c1107 100644</span><br><span>--- a/osmo-msc-latest/Dockerfile</span><br><span>+++ b/osmo-msc-latest/Dockerfile</span><br><span>@@ -2,11 +2,20 @@</span><br><span> ARG DISTRO</span><br><span> FROM $USER/$DISTRO-obs-latest</span><br><span> # Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG DISTRO</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN apt-get update && \</span><br><span style="color: hsl(0, 100%, 40%);">- apt-get install -y --no-install-recommends \</span><br><span style="color: hsl(0, 100%, 40%);">- osmo-msc && \</span><br><span style="color: hsl(0, 100%, 40%);">- apt-get clean</span><br><span style="color: hsl(120, 100%, 40%);">+RUN case "$DISTRO" in \</span><br><span style="color: hsl(120, 100%, 40%);">+ debian*) \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get update && \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get install -y --no-install-recommends \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-msc && \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get clean \</span><br><span style="color: hsl(120, 100%, 40%);">+ ;; \</span><br><span style="color: hsl(120, 100%, 40%);">+ centos*) \</span><br><span style="color: hsl(120, 100%, 40%);">+ dnf install -y \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-msc \</span><br><span style="color: hsl(120, 100%, 40%);">+ ;; \</span><br><span style="color: hsl(120, 100%, 40%);">+ esac</span><br><span> </span><br><span> WORKDIR /tmp</span><br><span> </span><br><span>diff --git a/osmo-nitb-latest/Dockerfile b/osmo-nitb-latest/Dockerfile</span><br><span>index c711f8d..8c3acb8 100644</span><br><span>--- a/osmo-nitb-latest/Dockerfile</span><br><span>+++ b/osmo-nitb-latest/Dockerfile</span><br><span>@@ -2,6 +2,7 @@</span><br><span> ARG DISTRO</span><br><span> FROM $USER/$DISTRO-obs-latest</span><br><span> # Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG DISTRO</span><br><span> </span><br><span> RUN apt-get update && \</span><br><span> apt-get install -y --no-install-recommends \</span><br><span>diff --git a/osmo-pcu-latest/Dockerfile b/osmo-pcu-latest/Dockerfile</span><br><span>index 4714bf2..622f933 100644</span><br><span>--- a/osmo-pcu-latest/Dockerfile</span><br><span>+++ b/osmo-pcu-latest/Dockerfile</span><br><span>@@ -2,11 +2,20 @@</span><br><span> ARG DISTRO</span><br><span> FROM $USER/$DISTRO-obs-latest</span><br><span> # Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG DISTRO</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN apt-get update && \</span><br><span style="color: hsl(0, 100%, 40%);">- apt-get install -y --no-install-recommends \</span><br><span style="color: hsl(0, 100%, 40%);">- osmo-pcu && \</span><br><span style="color: hsl(0, 100%, 40%);">- apt-get clean</span><br><span style="color: hsl(120, 100%, 40%);">+RUN case "$DISTRO" in \</span><br><span style="color: hsl(120, 100%, 40%);">+ debian*) \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get update && \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get install -y --no-install-recommends \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-pcu && \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get clean \</span><br><span style="color: hsl(120, 100%, 40%);">+ ;; \</span><br><span style="color: hsl(120, 100%, 40%);">+ centos*) \</span><br><span style="color: hsl(120, 100%, 40%);">+ dnf install -y \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-pcu \</span><br><span style="color: hsl(120, 100%, 40%);">+ ;; \</span><br><span style="color: hsl(120, 100%, 40%);">+ esac</span><br><span> </span><br><span> ADD respawn.sh /usr/local/bin/respawn.sh</span><br><span> </span><br><span>diff --git a/osmo-sgsn-latest/Dockerfile b/osmo-sgsn-latest/Dockerfile</span><br><span>index c3b1410..21728c9 100644</span><br><span>--- a/osmo-sgsn-latest/Dockerfile</span><br><span>+++ b/osmo-sgsn-latest/Dockerfile</span><br><span>@@ -2,11 +2,20 @@</span><br><span> ARG DISTRO</span><br><span> FROM $USER/$DISTRO-obs-latest</span><br><span> # Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG DISTRO</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN apt-get update && \</span><br><span style="color: hsl(0, 100%, 40%);">- apt-get install -y --no-install-recommends \</span><br><span style="color: hsl(0, 100%, 40%);">- osmo-sgsn && \</span><br><span style="color: hsl(0, 100%, 40%);">- apt-get clean</span><br><span style="color: hsl(120, 100%, 40%);">+RUN case "$DISTRO" in \</span><br><span style="color: hsl(120, 100%, 40%);">+ debian*) \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get update && \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get install -y --no-install-recommends \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-sgsn && \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get clean \</span><br><span style="color: hsl(120, 100%, 40%);">+ ;; \</span><br><span style="color: hsl(120, 100%, 40%);">+ centos*) \</span><br><span style="color: hsl(120, 100%, 40%);">+ dnf install -y \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-sgsn \</span><br><span style="color: hsl(120, 100%, 40%);">+ ;; \</span><br><span style="color: hsl(120, 100%, 40%);">+ esac</span><br><span> </span><br><span> WORKDIR /tmp</span><br><span> </span><br><span>diff --git a/osmo-sip-latest/Dockerfile b/osmo-sip-latest/Dockerfile</span><br><span>index 79dbf55..825735c 100644</span><br><span>--- a/osmo-sip-latest/Dockerfile</span><br><span>+++ b/osmo-sip-latest/Dockerfile</span><br><span>@@ -2,11 +2,20 @@</span><br><span> ARG DISTRO</span><br><span> FROM $USER/$DISTRO-obs-latest</span><br><span> # Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG DISTRO</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN apt-get update && \</span><br><span style="color: hsl(0, 100%, 40%);">- apt-get install -y --no-install-recommends \</span><br><span style="color: hsl(0, 100%, 40%);">- osmo-sip-connector && \</span><br><span style="color: hsl(0, 100%, 40%);">- apt-get clean</span><br><span style="color: hsl(120, 100%, 40%);">+RUN case "$DISTRO" in \</span><br><span style="color: hsl(120, 100%, 40%);">+ debian*) \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get update && \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get install -y --no-install-recommends \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-sip-connector && \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get clean \</span><br><span style="color: hsl(120, 100%, 40%);">+ ;; \</span><br><span style="color: hsl(120, 100%, 40%);">+ centos*) \</span><br><span style="color: hsl(120, 100%, 40%);">+ dnf install -y \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-sip-connector \</span><br><span style="color: hsl(120, 100%, 40%);">+ ;; \</span><br><span style="color: hsl(120, 100%, 40%);">+ esac</span><br><span> </span><br><span> WORKDIR /tmp</span><br><span> </span><br><span>diff --git a/osmo-smlc-latest/Dockerfile b/osmo-smlc-latest/Dockerfile</span><br><span>index 51e290a..12487ec 100644</span><br><span>--- a/osmo-smlc-latest/Dockerfile</span><br><span>+++ b/osmo-smlc-latest/Dockerfile</span><br><span>@@ -2,11 +2,20 @@</span><br><span> ARG DISTRO</span><br><span> FROM $USER/$DISTRO-obs-latest</span><br><span> # Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG DISTRO</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN apt-get update && \</span><br><span style="color: hsl(0, 100%, 40%);">- apt-get install -y --no-install-recommends \</span><br><span style="color: hsl(0, 100%, 40%);">- osmo-smlc && \</span><br><span style="color: hsl(0, 100%, 40%);">- apt-get clean</span><br><span style="color: hsl(120, 100%, 40%);">+RUN case "$DISTRO" in \</span><br><span style="color: hsl(120, 100%, 40%);">+ debian*) \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get update && \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get install -y --no-install-recommends \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-smlc && \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get clean \</span><br><span style="color: hsl(120, 100%, 40%);">+ ;; \</span><br><span style="color: hsl(120, 100%, 40%);">+ centos*) \</span><br><span style="color: hsl(120, 100%, 40%);">+ dnf install -y \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-smlc \</span><br><span style="color: hsl(120, 100%, 40%);">+ ;; \</span><br><span style="color: hsl(120, 100%, 40%);">+ esac</span><br><span> </span><br><span> WORKDIR /data</span><br><span> </span><br><span>diff --git a/osmo-stp-latest/Dockerfile b/osmo-stp-latest/Dockerfile</span><br><span>index c139af4..d3279f0 100644</span><br><span>--- a/osmo-stp-latest/Dockerfile</span><br><span>+++ b/osmo-stp-latest/Dockerfile</span><br><span>@@ -2,11 +2,20 @@</span><br><span> ARG DISTRO</span><br><span> FROM $USER/$DISTRO-obs-latest</span><br><span> # Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG DISTRO</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN apt-get update && \</span><br><span style="color: hsl(0, 100%, 40%);">- apt-get install -y --no-install-recommends \</span><br><span style="color: hsl(0, 100%, 40%);">- osmo-stp && \</span><br><span style="color: hsl(0, 100%, 40%);">- apt-get clean</span><br><span style="color: hsl(120, 100%, 40%);">+RUN case "$DISTRO" in \</span><br><span style="color: hsl(120, 100%, 40%);">+ debian*) \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get update && \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get install -y --no-install-recommends \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-stp && \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get clean \</span><br><span style="color: hsl(120, 100%, 40%);">+ ;; \</span><br><span style="color: hsl(120, 100%, 40%);">+ centos*) \</span><br><span style="color: hsl(120, 100%, 40%);">+ dnf install -y \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-stp \</span><br><span style="color: hsl(120, 100%, 40%);">+ ;; \</span><br><span style="color: hsl(120, 100%, 40%);">+ esac</span><br><span> </span><br><span> WORKDIR /data</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/23237">change 23237</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/docker-playground/+/23237"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: docker-playground </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I274b31d4903df07e99fd434af25bdb72991f6923 </div>
<div style="display:none"> Gerrit-Change-Number: 23237 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>