<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/18570">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">*-remsim-*: support centos8<br><br>Related: OS#4564<br>Change-Id: I0eb4e3ad17eb9e7716d630eaa4ae61f860818ff6<br>---<br>M osmo-remsim-master/Dockerfile<br>M ttcn3-remsim-test/Dockerfile<br>M ttcn3-remsim-test/jenkins.sh<br>3 files changed, 69 insertions(+), 30 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/70/18570/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/osmo-remsim-master/Dockerfile b/osmo-remsim-master/Dockerfile</span><br><span>index 0a15d93..82e1ec3 100644</span><br><span>--- a/osmo-remsim-master/Dockerfile</span><br><span>+++ b/osmo-remsim-master/Dockerfile</span><br><span>@@ -1,17 +1,31 @@</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> # 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 +36,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/ttcn3-remsim-test/Dockerfile b/ttcn3-remsim-test/Dockerfile</span><br><span>index b1ea71f..1cd9b44 100644</span><br><span>--- a/ttcn3-remsim-test/Dockerfile</span><br><span>+++ b/ttcn3-remsim-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-remsim-test/jenkins.sh b/ttcn3-remsim-test/jenkins.sh</span><br><span>index 1c2682c..fd4b73f 100755</span><br><span>--- a/ttcn3-remsim-test/jenkins.sh</span><br><span>+++ b/ttcn3-remsim-test/jenkins.sh</span><br><span>@@ -3,8 +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-remsim-$IMAGE_SUFFIX" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "$DISTRO-titan" \</span><br><span> "ttcn3-remsim-test"</span><br><span> </span><br><span> start_server() {</span><br><span>@@ -14,7 +15,7 @@</span><br><span> -v $VOL_BASE_DIR/server:/data \</span><br><span> --name ${BUILD_TAG}-server -d \</span><br><span> $DOCKER_ARGS \</span><br><span style="color: hsl(0, 100%, 40%);">- $REPO_USER/osmo-remsim-$IMAGE_SUFFIX \</span><br><span style="color: hsl(120, 100%, 40%);">+ $REPO_USER/osmo-remsim-$IMAGE_SUFFIX:$DOCKER_TAG \</span><br><span> /bin/sh -c "osmo-remsim-server >/data/osmo-remsim-server.log 2>&1"</span><br><span> }</span><br><span> </span><br><span>@@ -25,7 +26,7 @@</span><br><span> -v $VOL_BASE_DIR/bankd:/data \</span><br><span> --name ${BUILD_TAG}-bankd -d \</span><br><span> $DOCKER_ARGS \</span><br><span style="color: hsl(0, 100%, 40%);">- $REPO_USER/osmo-remsim-$IMAGE_SUFFIX \</span><br><span style="color: hsl(120, 100%, 40%);">+ $REPO_USER/osmo-remsim-$IMAGE_SUFFIX:$DOCKER_TAG \</span><br><span> /bin/sh -c "pcscd; osmo-remsim-bankd -i 172.18.17.10 >/data/osmo-remsim-bankd.log 2>&1"</span><br><span> }</span><br><span> </span><br><span>@@ -36,7 +37,7 @@</span><br><span> -v $VOL_BASE_DIR/client:/data \</span><br><span> --name ${BUILD_TAG}-client-d \</span><br><span> $DOCKER_ARGS \</span><br><span style="color: hsl(0, 100%, 40%);">- $REPO_USER/osmo-remsim-$IMAGE_SUFFIX \</span><br><span style="color: hsl(120, 100%, 40%);">+ $REPO_USER/osmo-remsim-$IMAGE_SUFFIX:$DOCKER_TAG \</span><br><span> /bin/sh -c "osmo-remsim-client-shell >/data/osmo-remsim-client.log 2>&1"</span><br><span> }</span><br><span> </span><br><span>@@ -50,7 +51,7 @@</span><br><span> -v $VOL_BASE_DIR/remsim-tester:/data \</span><br><span> --name ${BUILD_TAG}-ttcn3-remsim-test \</span><br><span> $DOCKER_ARGS \</span><br><span style="color: hsl(0, 100%, 40%);">- $REPO_USER/ttcn3-remsim-test</span><br><span style="color: hsl(120, 100%, 40%);">+ $REPO_USER/ttcn3-remsim-test:$DOCKER_TAG</span><br><span> }</span><br><span> </span><br><span> network_create 172.18.17.0/24</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/18570">change 18570</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/+/18570"/><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: I0eb4e3ad17eb9e7716d630eaa4ae61f860818ff6 </div>
<div style="display:none"> Gerrit-Change-Number: 18570 </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>