<p>osmith <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/18554">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, but someone else must approve
osmith: Looks good to me, approved; Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-*-master: support centos8<br><br>Adjust the Dockerfiles, so 'docker_images_require osmo-mgw-master-centos8'<br>etc. result in a centos8 based image. centos8-build already configures the<br>Osmocom nightly repository, so we only need to configure it for<br>debian-stretch.<br><br>Related: OS#4564<br>Change-Id: I6579748056ce0505304378b342a698b98c77fd18<br>---<br>M osmo-bsc-master/Dockerfile<br>M osmo-bts-master/Dockerfile<br>M osmo-ggsn-master/Dockerfile<br>M osmo-hlr-master/Dockerfile<br>M osmo-mgw-master/Dockerfile<br>M osmo-msc-master/Dockerfile<br>M osmo-pcu-master/Dockerfile<br>M osmo-remsim-master/Dockerfile<br>M osmo-sgsn-master/Dockerfile<br>M osmo-sip-master/Dockerfile<br>M osmo-stp-master/Dockerfile<br>11 files changed, 421 insertions(+), 163 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/osmo-bsc-master/Dockerfile b/osmo-bsc-master/Dockerfile</span><br><span>index 75afbb7..57b4b04 100644</span><br><span>--- a/osmo-bsc-master/Dockerfile</span><br><span>+++ b/osmo-bsc-master/Dockerfile</span><br><span>@@ -1,5 +1,8 @@</span><br><span> ARG USER</span><br><span style="color: hsl(0, 100%, 40%);">-FROM $USER/debian-stretch-build</span><br><span style="color: hsl(120, 100%, 40%);">+ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/$DISTRO-build</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 DISTRO</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>@@ -7,22 +10,43 @@</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN apt-key add /tmp/Release.key && \</span><br><span style="color: hsl(0, 100%, 40%);">- rm /tmp/Release.key && \</span><br><span style="color: hsl(0, 100%, 40%);">- echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list</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-key add /tmp/Release.key && \</span><br><span style="color: hsl(120, 100%, 40%);">+ rm /tmp/Release.key && \</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list \</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 $OSMOCOM_REPO/Release /tmp/Release</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%);">- telnet \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmocore-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-abis-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-netif-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-sccp-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-sigtran-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-mgcp-client-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libgtp-dev && \</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%);">+ telnet \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmocore-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmo-abis-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmo-netif-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmo-sccp-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmo-sigtran-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmo-mgcp-client-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libgtp-dev && \</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%);">+ "pkgconfig(libosmo-mgcp-client)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmo-netif)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmo-sccp)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmo-sigtran)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmoabis)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmocore)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmoctrl)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmogb)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmogsm)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmovty)" \</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-master/Dockerfile b/osmo-bts-master/Dockerfile</span><br><span>index b73f2ac..98b0bb0 100644</span><br><span>--- a/osmo-bts-master/Dockerfile</span><br><span>+++ b/osmo-bts-master/Dockerfile</span><br><span>@@ -1,5 +1,8 @@</span><br><span> ARG USER</span><br><span style="color: hsl(0, 100%, 40%);">-FROM $USER/debian-stretch-build</span><br><span style="color: hsl(120, 100%, 40%);">+ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/$DISTRO-build</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 DISTRO</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>@@ -7,21 +10,42 @@</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN apt-key add /tmp/Release.key && \</span><br><span style="color: hsl(0, 100%, 40%);">- rm /tmp/Release.key && \</span><br><span style="color: hsl(0, 100%, 40%);">- echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list</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-key add /tmp/Release.key && \</span><br><span style="color: hsl(120, 100%, 40%);">+ rm /tmp/Release.key && \</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list \</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 $OSMOCOM_REPO/Release /tmp/Release</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%);">- telnet \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmocore-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-abis-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-netif-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-sccp-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libsmpp34-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libgtp-dev && \</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%);">+ telnet \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmocore-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmo-abis-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmo-netif-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmo-sccp-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libsmpp34-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libgtp-dev && \</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%);">+ "pkgconfig(libosmoabis)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmocodec)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmocoding)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmocore)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmoctrl)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmogb)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmogsm)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmotrau)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmovty)" \</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%);">+ 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-ggsn-master/Dockerfile b/osmo-ggsn-master/Dockerfile</span><br><span>index 3802670..81444d8 100644</span><br><span>--- a/osmo-ggsn-master/Dockerfile</span><br><span>+++ b/osmo-ggsn-master/Dockerfile</span><br><span>@@ -1,5 +1,8 @@</span><br><span> ARG USER</span><br><span style="color: hsl(0, 100%, 40%);">-FROM $USER/debian-stretch-build</span><br><span style="color: hsl(120, 100%, 40%);">+ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/$DISTRO-build</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 DISTRO</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>@@ -7,16 +10,33 @@</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN apt-key add /tmp/Release.key && \</span><br><span style="color: hsl(0, 100%, 40%);">- rm /tmp/Release.key && \</span><br><span style="color: hsl(0, 100%, 40%);">- echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list</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-key add /tmp/Release.key && \</span><br><span style="color: hsl(120, 100%, 40%);">+ rm /tmp/Release.key && \</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list \</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 $OSMOCOM_REPO/Release /tmp/Release</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%);">- telnet \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmocore-dev && \</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%);">+ telnet \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmocore-dev && \</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%);">+ telnet \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libgtpnl)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libmnl)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmocore)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmoctrl)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmovty)" \</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-master/Dockerfile b/osmo-hlr-master/Dockerfile</span><br><span>index 3aa8468..d4727cc 100644</span><br><span>--- a/osmo-hlr-master/Dockerfile</span><br><span>+++ b/osmo-hlr-master/Dockerfile</span><br><span>@@ -1,5 +1,8 @@</span><br><span> ARG USER</span><br><span style="color: hsl(0, 100%, 40%);">-FROM $USER/debian-stretch-build</span><br><span style="color: hsl(120, 100%, 40%);">+ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/$DISTRO-build</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 DISTRO</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>@@ -7,20 +10,38 @@</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN apt-key add /tmp/Release.key && \</span><br><span style="color: hsl(0, 100%, 40%);">- rm /tmp/Release.key && \</span><br><span style="color: hsl(0, 100%, 40%);">- echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list</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-key add /tmp/Release.key && \</span><br><span style="color: hsl(120, 100%, 40%);">+ rm /tmp/Release.key && \</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list \</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 $OSMOCOM_REPO/Release /tmp/Release</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%);">- libosmo-abis-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-netif-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-sigtran-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmocore-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- telnet && \</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%);">+ libosmo-abis-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmo-netif-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmo-sigtran-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmocore-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ telnet && \</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%);">+ "pkgconfig(libosmoabis)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmocore)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmoctrl)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmogsm)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmovty)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ python3 \</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%);">+ esac</span><br><span> </span><br><span> WORKDIR /tmp</span><br><span> </span><br><span>diff --git a/osmo-mgw-master/Dockerfile b/osmo-mgw-master/Dockerfile</span><br><span>index f898c7e..773c2a5 100644</span><br><span>--- a/osmo-mgw-master/Dockerfile</span><br><span>+++ b/osmo-mgw-master/Dockerfile</span><br><span>@@ -1,5 +1,8 @@</span><br><span> ARG USER</span><br><span style="color: hsl(0, 100%, 40%);">-FROM $USER/debian-stretch-build</span><br><span style="color: hsl(120, 100%, 40%);">+ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/$DISTRO-build</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 DISTRO</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>@@ -7,19 +10,37 @@</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN apt-key add /tmp/Release.key && \</span><br><span style="color: hsl(0, 100%, 40%);">- rm /tmp/Release.key && \</span><br><span style="color: hsl(0, 100%, 40%);">- echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list</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-key add /tmp/Release.key && \</span><br><span style="color: hsl(120, 100%, 40%);">+ rm /tmp/Release.key && \</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list \</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 $OSMOCOM_REPO/Release /tmp/Release</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%);">- telnet \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmocore-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-abis-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-netif-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-sccp-dev && \</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%);">+ telnet \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmocore-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmo-abis-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmo-netif-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmo-sccp-dev && \</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%);">+ telnet \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmo-netif)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmocore)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmoctrl)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmogsm)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmovty)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmocoding)" \</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-master/Dockerfile b/osmo-msc-master/Dockerfile</span><br><span>index 55e5d6e..366e77c 100644</span><br><span>--- a/osmo-msc-master/Dockerfile</span><br><span>+++ b/osmo-msc-master/Dockerfile</span><br><span>@@ -1,5 +1,8 @@</span><br><span> ARG USER</span><br><span style="color: hsl(0, 100%, 40%);">-FROM $USER/debian-stretch-build</span><br><span style="color: hsl(120, 100%, 40%);">+ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/$DISTRO-build</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 DISTRO</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>@@ -7,27 +10,52 @@</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN apt-key add /tmp/Release.key && \</span><br><span style="color: hsl(0, 100%, 40%);">- rm /tmp/Release.key && \</span><br><span style="color: hsl(0, 100%, 40%);">- echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list</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-key add /tmp/Release.key && \</span><br><span style="color: hsl(120, 100%, 40%);">+ rm /tmp/Release.key && \</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list \</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 $OSMOCOM_REPO/Release /tmp/Release</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%);">- libasn1c-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libdbd-sqlite3 \</span><br><span style="color: hsl(0, 100%, 40%);">- libdbi-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-abis-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-mgcp-client-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-gsup-client-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-netif-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-ranap-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-sccp-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-sigtran-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmocore-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libsmpp34-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- telnet && \</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%);">+ libasn1c-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libdbd-sqlite3 \</span><br><span style="color: hsl(120, 100%, 40%);">+ libdbi-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmo-abis-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmo-mgcp-client-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmo-gsup-client-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmo-netif-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmo-ranap-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmo-sccp-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmo-sigtran-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmocore-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libsmpp34-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ telnet && \</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%);">+ telnet \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libasn1c)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmo-gsup-client)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmo-mgcp-client)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmo-netif)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmo-ranap)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmo-sccp)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmo-sigtran)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmoabis)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmocore)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmoctrl)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmogsm)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmovty)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libsmpp34)" \</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-pcu-master/Dockerfile b/osmo-pcu-master/Dockerfile</span><br><span>index 1aed8c9..e8ce5d8 100644</span><br><span>--- a/osmo-pcu-master/Dockerfile</span><br><span>+++ b/osmo-pcu-master/Dockerfile</span><br><span>@@ -1,5 +1,8 @@</span><br><span> ARG USER</span><br><span style="color: hsl(0, 100%, 40%);">-FROM $USER/debian-stretch-build</span><br><span style="color: hsl(120, 100%, 40%);">+ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/$DISTRO-build</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 DISTRO</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>@@ -7,16 +10,32 @@</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN apt-key add /tmp/Release.key && \</span><br><span style="color: hsl(0, 100%, 40%);">- rm /tmp/Release.key && \</span><br><span style="color: hsl(0, 100%, 40%);">- echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list</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-key add /tmp/Release.key && \</span><br><span style="color: hsl(120, 100%, 40%);">+ rm /tmp/Release.key && \</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list \</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 $OSMOCOM_REPO/Release /tmp/Release</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%);">- telnet \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmocore-dev && \</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%);">+ telnet \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmocore-dev && \</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%);">+ telnet \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmocore)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmogb)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmogsm)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmovty)" \</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-remsim-master/Dockerfile b/osmo-remsim-master/Dockerfile</span><br><span>index 0a15d93..bed7f47 100644</span><br><span>--- a/osmo-remsim-master/Dockerfile</span><br><span>+++ b/osmo-remsim-master/Dockerfile</span><br><span>@@ -1,17 +1,30 @@</span><br><span> ARG USER</span><br><span style="color: hsl(0, 100%, 40%);">-FROM $USER/debian-stretch-build</span><br><span style="color: hsl(120, 100%, 40%);">+ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/$DISTRO-build</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 DISTRO</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span> # PC/SC required for testing of bankd (with vpcd)</span><br><span> # autoconf, automake, libtool, pkg-config, m4, help2man required for virtualsmartcard</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%);">- libpcsclite-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- pcscd \</span><br><span style="color: hsl(0, 100%, 40%);">- pcsc-tools \</span><br><span style="color: hsl(0, 100%, 40%);">- autoconf automake libtool pkg-config m4 help2man ca-certificates && \</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%);">+ libpcsclite-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ pcscd \</span><br><span style="color: hsl(120, 100%, 40%);">+ pcsc-tools \</span><br><span style="color: hsl(120, 100%, 40%);">+ autoconf automake libtool pkg-config m4 help2man ca-certificates && \</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%);">+ pcsc-lite \</span><br><span style="color: hsl(120, 100%, 40%);">+ help2man \</span><br><span style="color: hsl(120, 100%, 40%);">+ python3 \</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> # build virtualsmartcard</span><br><span> RUN git clone https://github.com/frankmorgner/vsmartcard.git</span><br><span>@@ -22,24 +35,46 @@</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN apt-key add /tmp/Release.key && \</span><br><span style="color: hsl(0, 100%, 40%);">- rm /tmp/Release.key && \</span><br><span style="color: hsl(0, 100%, 40%);">- echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list</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-key add /tmp/Release.key && \</span><br><span style="color: hsl(120, 100%, 40%);">+ rm /tmp/Release.key && \</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list \</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 $OSMOCOM_REPO/Release /tmp/Release</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%);">- telnet \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmocore-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-simtrace2-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-abis-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-netif-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libpcsclite-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libcsv-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libjansson-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libulfius-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- liborcania-dev && \</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%);">+ telnet \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmocore-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmo-simtrace2-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmo-abis-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmo-netif-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libpcsclite-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libcsv-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libjansson-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libulfius-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ liborcania-dev && \</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%);">+ telnet \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libasn1c)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmoabis)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmocore)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmogsm)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmosim)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libpcsclite)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libulfius)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libusb-1.0)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmousb)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmo-simtrace2)" \</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-master/Dockerfile b/osmo-sgsn-master/Dockerfile</span><br><span>index 10fc92e..1121712 100644</span><br><span>--- a/osmo-sgsn-master/Dockerfile</span><br><span>+++ b/osmo-sgsn-master/Dockerfile</span><br><span>@@ -1,5 +1,8 @@</span><br><span> ARG USER</span><br><span style="color: hsl(0, 100%, 40%);">-FROM $USER/debian-stretch-build</span><br><span style="color: hsl(120, 100%, 40%);">+ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/$DISTRO-build</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 DISTRO</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>@@ -7,25 +10,50 @@</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN apt-key add /tmp/Release.key && \</span><br><span style="color: hsl(0, 100%, 40%);">- rm /tmp/Release.key && \</span><br><span style="color: hsl(0, 100%, 40%);">- echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list</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-key add /tmp/Release.key && \</span><br><span style="color: hsl(120, 100%, 40%);">+ rm /tmp/Release.key && \</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list \</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 $OSMOCOM_REPO/Release /tmp/Release</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%);">- telnet \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmocore-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-abis-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-gsup-client-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-netif-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-ranap-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-sccp-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-sigtran-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libsmpp34-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libgtp-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libasn1c-dev && \</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%);">+ telnet \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmocore-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmo-abis-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmo-gsup-client-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmo-netif-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmo-ranap-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmo-sccp-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmo-sigtran-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libsmpp34-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libgtp-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libasn1c-dev && \</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%);">+ telnet \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libasn1c)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libcrypto)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libgtp)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmo-gsup-client)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmo-netif)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmo-ranap)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmo-sigtran)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmoabis)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmocore)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmoctrl)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmogb)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmogsm)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmovty)" \</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-master/Dockerfile b/osmo-sip-master/Dockerfile</span><br><span>index 2407984..b15a2c9 100644</span><br><span>--- a/osmo-sip-master/Dockerfile</span><br><span>+++ b/osmo-sip-master/Dockerfile</span><br><span>@@ -1,5 +1,8 @@</span><br><span> ARG USER</span><br><span style="color: hsl(0, 100%, 40%);">-FROM $USER/debian-stretch-build</span><br><span style="color: hsl(120, 100%, 40%);">+ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/$DISTRO-build</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 DISTRO</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>@@ -7,26 +10,42 @@</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN apt-key add /tmp/Release.key && \</span><br><span style="color: hsl(0, 100%, 40%);">- rm /tmp/Release.key && \</span><br><span style="color: hsl(0, 100%, 40%);">- echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list</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-key add /tmp/Release.key && \</span><br><span style="color: hsl(120, 100%, 40%);">+ rm /tmp/Release.key && \</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list \</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 $OSMOCOM_REPO/Release /tmp/Release</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%);">- libasn1c-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libdbd-sqlite3 \</span><br><span style="color: hsl(0, 100%, 40%);">- libdbi-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-abis-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-mgcp-client-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-netif-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-ranap-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-sccp-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-sigtran-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmocore-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libsmpp34-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- telnet && \</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%);">+ libasn1c-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libdbd-sqlite3 \</span><br><span style="color: hsl(120, 100%, 40%);">+ libdbi-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmo-abis-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmo-mgcp-client-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmo-netif-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmo-ranap-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmo-sccp-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmo-sigtran-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmocore-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libsmpp34-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ telnet && \</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%);">+ "pkgconfig(libosmocore)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmogsm)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmovty)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(sofia-sip-ua-glib)" \</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%);">+ esac</span><br><span> </span><br><span> WORKDIR /tmp</span><br><span> </span><br><span>diff --git a/osmo-stp-master/Dockerfile b/osmo-stp-master/Dockerfile</span><br><span>index 62bcbc7..a91313f 100644</span><br><span>--- a/osmo-stp-master/Dockerfile</span><br><span>+++ b/osmo-stp-master/Dockerfile</span><br><span>@@ -1,5 +1,8 @@</span><br><span> ARG USER</span><br><span style="color: hsl(0, 100%, 40%);">-FROM $USER/debian-stretch-build</span><br><span style="color: hsl(120, 100%, 40%);">+ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/$DISTRO-build</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 DISTRO</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span>@@ -7,17 +10,33 @@</span><br><span> </span><br><span> COPY Release.key /tmp/Release.key</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN apt-key add /tmp/Release.key && \</span><br><span style="color: hsl(0, 100%, 40%);">- rm /tmp/Release.key && \</span><br><span style="color: hsl(0, 100%, 40%);">- echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list</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-key add /tmp/Release.key && \</span><br><span style="color: hsl(120, 100%, 40%);">+ rm /tmp/Release.key && \</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list \</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 $OSMOCOM_REPO/Release /tmp/Release</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%);">- telnet \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmocore-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-netif-dev && \</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%);">+ telnet \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmocore-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmo-netif-dev && \</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%);">+ telnet \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmo-netif)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmocore)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmogsm)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "pkgconfig(libosmovty)" \</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></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/18554">change 18554</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/+/18554"/><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: I6579748056ce0505304378b342a698b98c77fd18 </div>
<div style="display:none"> Gerrit-Change-Number: 18554 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>