<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/18567">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">*-ggsn-*: support centos8<br><br>Related: OS#4564<br>Change-Id: I7ea6a60bc53415e5b3050b4ed4d1b2d6aeeb8065<br>---<br>M osmo-ggsn-master/Dockerfile<br>M ttcn3-ggsn-test/Dockerfile<br>M ttcn3-ggsn-test/jenkins.sh<br>3 files changed, 37 insertions(+), 14 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/67/18567/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/osmo-ggsn-master/Dockerfile b/osmo-ggsn-master/Dockerfile</span><br><span>index 3802670..f9c275a 100644</span><br><span>--- a/osmo-ggsn-master/Dockerfile</span><br><span>+++ b/osmo-ggsn-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,16 +11,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/ttcn3-ggsn-test/Dockerfile b/ttcn3-ggsn-test/Dockerfile</span><br><span>index 7e88f28..df1cf54 100644</span><br><span>--- a/ttcn3-ggsn-test/Dockerfile</span><br><span>+++ b/ttcn3-ggsn-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 git clone git://git.osmocom.org/osmo-ttcn3-hacks.git</span><br><span> </span><br><span>diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh</span><br><span>index a69e640..5a27987 100755</span><br><span>--- a/ttcn3-ggsn-test/jenkins.sh</span><br><span>+++ b/ttcn3-ggsn-test/jenkins.sh</span><br><span>@@ -3,9 +3,9 @@</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-ggsn-$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-ggsn-test"</span><br><span> </span><br><span> mkdir $VOL_BASE_DIR/ggsn-tester</span><br><span>@@ -25,7 +25,7 @@</span><br><span> -v $VOL_BASE_DIR/ggsn:/data \</span><br><span> --name ${BUILD_TAG}-ggsn -d \</span><br><span> $DOCKER_ARGS \</span><br><span style="color: hsl(0, 100%, 40%);">- $REPO_USER/osmo-ggsn-$IMAGE_SUFFIX \</span><br><span style="color: hsl(120, 100%, 40%);">+ $REPO_USER/osmo-ggsn-$IMAGE_SUFFIX:$DOCKER_TAG \</span><br><span> /bin/sh -c "osmo-ggsn -c /data/osmo-ggsn.cfg >/data/osmo-ggsn.log 2>&1"</span><br><span> </span><br><span> # start docker container with testsuite in foreground</span><br><span>@@ -36,7 +36,7 @@</span><br><span> -e "TTCN3_PCAP_PATH=/data" \</span><br><span> --name ${BUILD_TAG}-ggsn-test \</span><br><span> $DOCKER_ARGS \</span><br><span style="color: hsl(0, 100%, 40%);">- $REPO_USER/ttcn3-ggsn-test</span><br><span style="color: hsl(120, 100%, 40%);">+ $REPO_USER/ttcn3-ggsn-test:$DOCKER_TAG</span><br><span> </span><br><span> # stop GGSN after test has completed</span><br><span> docker container stop ${BUILD_TAG}-ggsn</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/18567">change 18567</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/+/18567"/><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: I7ea6a60bc53415e5b3050b4ed4d1b2d6aeeb8065 </div>
<div style="display:none"> Gerrit-Change-Number: 18567 </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>