<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/18573">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">*-sgsn-*: support centos8<br><br>Related: OS#4564<br>Change-Id: I8c79ecc154e29a369352621f503fef5a3342ac92<br>---<br>M osmo-sgsn-master/Dockerfile<br>M ttcn3-sgsn-test/Dockerfile<br>M ttcn3-sgsn-test/jenkins.sh<br>3 files changed, 56 insertions(+), 25 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/73/18573/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/osmo-sgsn-master/Dockerfile b/osmo-sgsn-master/Dockerfile</span><br><span>index 10fc92e..1a6a7a4 100644</span><br><span>--- a/osmo-sgsn-master/Dockerfile</span><br><span>+++ b/osmo-sgsn-master/Dockerfile</span><br><span>@@ -1,5 +1,9 @@</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%);">+ARG DOCKER_TAG</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/$DISTRO-build:$DOCKER_TAG</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 +11,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/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile</span><br><span>index fcc2c02..75f61c1 100644</span><br><span>--- a/ttcn3-sgsn-test/Dockerfile</span><br><span>+++ b/ttcn3-sgsn-test/Dockerfile</span><br><span>@@ -1,5 +1,7 @@</span><br><span> ARG USER</span><br><span style="color: hsl(0, 100%, 40%);">-FROM $USER/debian-stretch-titan</span><br><span style="color: hsl(120, 100%, 40%);">+ARG DISTRO</span><br><span style="color: hsl(120, 100%, 40%);">+ARG DOCKER_TAG</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/$DISTRO-titan:$DOCKER_TAG</span><br><span> </span><br><span> RUN mkdir /root/projects && (cd /root/projects && ln -sf / git)</span><br><span> RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git</span><br><span>diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh</span><br><span>index 9db295a..336368d 100755</span><br><span>--- a/ttcn3-sgsn-test/jenkins.sh</span><br><span>+++ b/ttcn3-sgsn-test/jenkins.sh</span><br><span>@@ -3,10 +3,10 @@</span><br><span> . ../jenkins-common.sh</span><br><span> IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"</span><br><span> docker_images_require \</span><br><span style="color: hsl(0, 100%, 40%);">- "debian-stretch-build" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "$DISTRO-build" \</span><br><span> "osmo-stp-$IMAGE_SUFFIX" \</span><br><span> "osmo-sgsn-$IMAGE_SUFFIX" \</span><br><span style="color: hsl(0, 100%, 40%);">- "debian-stretch-titan" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "$DISTRO-titan" \</span><br><span> "ttcn3-sgsn-test"</span><br><span> </span><br><span> network_create 172.18.8.0/24</span><br><span>@@ -28,7 +28,7 @@</span><br><span> -v $VOL_BASE_DIR/stp:/data \</span><br><span> --name ${BUILD_TAG}-stp -d \</span><br><span> $DOCKER_ARGS \</span><br><span style="color: hsl(0, 100%, 40%);">- $REPO_USER/osmo-stp-$IMAGE_SUFFIX</span><br><span style="color: hsl(120, 100%, 40%);">+ $REPO_USER/osmo-stp-$IMAGE_SUFFIX:$DOCKER_TAG</span><br><span> </span><br><span> echo Starting container with SGSN</span><br><span> docker run --rm \</span><br><span>@@ -36,7 +36,7 @@</span><br><span> -v $VOL_BASE_DIR/sgsn:/data \</span><br><span> --name ${BUILD_TAG}-sgsn -d \</span><br><span> $DOCKER_ARGS \</span><br><span style="color: hsl(0, 100%, 40%);">- $REPO_USER/osmo-sgsn-$IMAGE_SUFFIX \</span><br><span style="color: hsl(120, 100%, 40%);">+ $REPO_USER/osmo-sgsn-$IMAGE_SUFFIX:$DOCKER_TAG \</span><br><span> /bin/sh -c "osmo-sgsn -c /data/osmo-sgsn.cfg >/data/osmo-sgsn.log 2>&1"</span><br><span> </span><br><span> echo Starting container with SGSN testsuite</span><br><span>@@ -46,7 +46,7 @@</span><br><span> -v $VOL_BASE_DIR/sgsn-tester:/data \</span><br><span> --name ${BUILD_TAG}-ttcn3-sgsn-test \</span><br><span> $DOCKER_ARGS \</span><br><span style="color: hsl(0, 100%, 40%);">- $REPO_USER/ttcn3-sgsn-test $@</span><br><span style="color: hsl(120, 100%, 40%);">+ $REPO_USER/ttcn3-sgsn-test:$DOCKER_TAG $@</span><br><span> </span><br><span> echo Starting container to merge logs</span><br><span> docker run --rm \</span><br><span>@@ -56,7 +56,7 @@</span><br><span> --name ${BUILD_TAG}-ttcn3-sgsn-test-logmerge \</span><br><span> --entrypoint /osmo-ttcn3-hacks/log_merge.sh SGSN_Tests --rm \</span><br><span> $DOCKER_ARGS \</span><br><span style="color: hsl(0, 100%, 40%);">- $REPO_USER/ttcn3-sgsn-test</span><br><span style="color: hsl(120, 100%, 40%);">+ $REPO_USER/ttcn3-sgsn-test:$DOCKER_TAG</span><br><span> </span><br><span> echo Stopping containers</span><br><span> docker container kill ${BUILD_TAG}-sgsn</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/18573">change 18573</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/+/18573"/><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: I8c79ecc154e29a369352621f503fef5a3342ac92 </div>
<div style="display:none"> Gerrit-Change-Number: 18573 </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>