<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/18575">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">*-bsc-*: support centos8<br><br>Related: OS#4564<br>Change-Id: Ib717975ba4689d60d2dc5cbbd4f79ed8a78b03cd<br>---<br>M osmo-bsc-master/Dockerfile<br>M ttcn3-bsc-test/Dockerfile<br>M ttcn3-bsc-test/jenkins.sh<br>3 files changed, 49 insertions(+), 22 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/75/18575/1</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..3e9e880 100644</span><br><span>--- a/osmo-bsc-master/Dockerfile</span><br><span>+++ b/osmo-bsc-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,22 +11,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/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile</span><br><span>index 9288469..bf490fb 100644</span><br><span>--- a/ttcn3-bsc-test/Dockerfile</span><br><span>+++ b/ttcn3-bsc-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-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh</span><br><span>index 44badb5..1955e5f 100755</span><br><span>--- a/ttcn3-bsc-test/jenkins.sh</span><br><span>+++ b/ttcn3-bsc-test/jenkins.sh</span><br><span>@@ -3,11 +3,11 @@</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-bsc-$IMAGE_SUFFIX" \</span><br><span> "osmo-bts-$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-bsc-test"</span><br><span> </span><br><span> mkdir $VOL_BASE_DIR/bsc-tester</span><br><span>@@ -27,7 +27,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 BSC</span><br><span> docker run --rm \</span><br><span>@@ -35,7 +35,7 @@</span><br><span> -v $VOL_BASE_DIR/bsc:/data \</span><br><span> --name ${BUILD_TAG}-bsc -d \</span><br><span> $DOCKER_ARGS \</span><br><span style="color: hsl(0, 100%, 40%);">- $REPO_USER/osmo-bsc-$IMAGE_SUFFIX</span><br><span style="color: hsl(120, 100%, 40%);">+ $REPO_USER/osmo-bsc-$IMAGE_SUFFIX:$DOCKER_TAG</span><br><span> </span><br><span> for i in `seq 0 2`; do</span><br><span> echo Starting container with OML for BTS$i</span><br><span>@@ -43,7 +43,7 @@</span><br><span> --network $NET_NAME --ip 172.18.2.10$i \</span><br><span> --name ${BUILD_TAG}-bts$i -d \</span><br><span> $DOCKER_ARGS \</span><br><span style="color: hsl(0, 100%, 40%);">- $REPO_USER/osmo-bts-$IMAGE_SUFFIX \</span><br><span style="color: hsl(120, 100%, 40%);">+ $REPO_USER/osmo-bts-$IMAGE_SUFFIX:$DOCKER_TAG \</span><br><span> /bin/sh -c "/usr/local/bin/respawn.sh osmo-bts-omldummy 172.18.2.20 $((i + 1234)) 1 >>/data/osmo-bts-omldummy-${i}.log 2>&1"</span><br><span> done</span><br><span> </span><br><span>@@ -54,7 +54,7 @@</span><br><span> -v $VOL_BASE_DIR/bsc-tester:/data \</span><br><span> --name ${BUILD_TAG}-ttcn3-bsc-test \</span><br><span> $DOCKER_ARGS \</span><br><span style="color: hsl(0, 100%, 40%);">- $REPO_USER/ttcn3-bsc-test</span><br><span style="color: hsl(120, 100%, 40%);">+ $REPO_USER/ttcn3-bsc-test:$DOCKER_TAG</span><br><span> </span><br><span> echo Stopping containers</span><br><span> for i in `seq 0 2`; do</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/18575">change 18575</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/+/18575"/><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: Ib717975ba4689d60d2dc5cbbd4f79ed8a78b03cd </div>
<div style="display:none"> Gerrit-Change-Number: 18575 </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>