<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/18576">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">*-bts-*: support centos8<br><br>Related: OS#4564<br>Change-Id: I38a0b9d01cfa1112b9039682f627115ad5d3022d<br>---<br>M osmo-bts-master/Dockerfile<br>M osmocom-bb-host-master/Dockerfile<br>M ttcn3-bts-test/Dockerfile<br>M ttcn3-bts-test/jenkins.sh<br>4 files changed, 81 insertions(+), 31 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/76/18576/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/osmo-bts-master/Dockerfile b/osmo-bts-master/Dockerfile</span><br><span>index b73f2ac..e0d766b 100644</span><br><span>--- a/osmo-bts-master/Dockerfile</span><br><span>+++ b/osmo-bts-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,21 +11,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/osmocom-bb-host-master/Dockerfile b/osmocom-bb-host-master/Dockerfile</span><br><span>index 1d79f06..14ed909 100644</span><br><span>--- a/osmocom-bb-host-master/Dockerfile</span><br><span>+++ b/osmocom-bb-host-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>@@ -9,16 +13,35 @@</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> # python-enum34 is a dependecy of fake_trx as long we're using python2</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%);">- libosmocore-dev python-enum34 && \</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%);">+ libosmocore-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ python-enum34 && \</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%);">+ python2 \</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(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-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile</span><br><span>index 29185c8..c0fea72 100644</span><br><span>--- a/ttcn3-bts-test/Dockerfile</span><br><span>+++ b/ttcn3-bts-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-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh</span><br><span>index 00e8133..6dab7c2 100755</span><br><span>--- a/ttcn3-bts-test/jenkins.sh</span><br><span>+++ b/ttcn3-bts-test/jenkins.sh</span><br><span>@@ -4,11 +4,11 @@</span><br><span> IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"</span><br><span> # NOTE: there is no osmocom-bb-host-latest, hence always use 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-bsc-$IMAGE_SUFFIX" \</span><br><span> "osmo-bts-$IMAGE_SUFFIX" \</span><br><span> "osmocom-bb-host-master" \</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-bts-test"</span><br><span> </span><br><span> start_bsc() {</span><br><span>@@ -18,7 +18,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> /bin/sh -c "osmo-bsc -c /data/osmo-bsc.cfg >>/data/osmo-bsc.log 2>&1"</span><br><span> }</span><br><span> </span><br><span>@@ -36,7 +36,7 @@</span><br><span> -v $VOL_BASE_DIR/unix:/data/unix \</span><br><span> --name ${BUILD_TAG}-bts -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-$variant -c /data/osmo-bts.cfg -i 172.18.9.10 >>/data/osmo-bts.log 2>&1"</span><br><span> }</span><br><span> </span><br><span>@@ -47,7 +47,7 @@</span><br><span> -v $VOL_BASE_DIR/fake_trx:/data \</span><br><span> --name ${BUILD_TAG}-fake_trx -d \</span><br><span> $DOCKER_ARGS \</span><br><span style="color: hsl(0, 100%, 40%);">- $REPO_USER/osmocom-bb-host-master \</span><br><span style="color: hsl(120, 100%, 40%);">+ $REPO_USER/osmocom-bb-host-master:$DOCKER_TAG \</span><br><span> /tmp/osmocom-bb/src/target/trx_toolkit/fake_trx.py \</span><br><span> --log-file-name /data/fake_trx.log \</span><br><span> --log-file-level DEBUG \</span><br><span>@@ -64,7 +64,7 @@</span><br><span> -v $VOL_BASE_DIR/unix:/data/unix \</span><br><span> --name ${BUILD_TAG}-trxcon -d \</span><br><span> $DOCKER_ARGS \</span><br><span style="color: hsl(0, 100%, 40%);">- $REPO_USER/osmocom-bb-host-master \</span><br><span style="color: hsl(120, 100%, 40%);">+ $REPO_USER/osmocom-bb-host-master:$DOCKER_TAG \</span><br><span> /bin/sh -c "trxcon -i 172.18.9.21 -s /data/unix/osmocom_l2 >>/data/trxcon.log 2>&1"</span><br><span> }</span><br><span> </span><br><span>@@ -75,7 +75,7 @@</span><br><span> -v $VOL_BASE_DIR/unix:/data/unix \</span><br><span> --name ${BUILD_TAG}-virtphy -d \</span><br><span> $DOCKER_ARGS \</span><br><span style="color: hsl(0, 100%, 40%);">- $REPO_USER/osmocom-bb-host-master \</span><br><span style="color: hsl(120, 100%, 40%);">+ $REPO_USER/osmocom-bb-host-master:$DOCKER_TAG \</span><br><span> virtphy -s /data/unix/osmocom_l2</span><br><span> /bin/sh -c "virtphy -s /data/unix/osmocom_l2 >>/data/virtphy.log 2>&1"</span><br><span> }</span><br><span>@@ -89,7 +89,7 @@</span><br><span> -v $VOL_BASE_DIR/unix:/data/unix \</span><br><span> --name ${BUILD_TAG}-ttcn3-bts-test \</span><br><span> $DOCKER_ARGS \</span><br><span style="color: hsl(0, 100%, 40%);">- $REPO_USER/ttcn3-bts-test</span><br><span style="color: hsl(120, 100%, 40%);">+ $REPO_USER/ttcn3-bts-test:$DOCKER_TAG</span><br><span> }</span><br><span> </span><br><span> network_create 172.18.9.0/24</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/18576">change 18576</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/+/18576"/><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: I38a0b9d01cfa1112b9039682f627115ad5d3022d </div>
<div style="display:none"> Gerrit-Change-Number: 18576 </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>