Change in docker-playground[master]: *-bsc-*: support centos8

[osmith]

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/18575 )


Change subject: *-bsc-*: support centos8
......................................................................

*-bsc-*: support centos8

Related: OS#4564
Change-Id: Ib717975ba4689d60d2dc5cbbd4f79ed8a78b03cd
---
M osmo-bsc-master/Dockerfile
M ttcn3-bsc-test/Dockerfile
M ttcn3-bsc-test/jenkins.sh
3 files changed, 49 insertions(+), 22 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/75/18575/1

diff --git a/osmo-bsc-master/Dockerfile b/osmo-bsc-master/Dockerfile
index 75afbb7..3e9e880 100644
--- a/osmo-bsc-master/Dockerfile
+++ b/osmo-bsc-master/Dockerfile
@@ -1,5 +1,9 @@
 ARG	USER
-FROM	$USER/debian-stretch-build
+ARG	DISTRO
+ARG	DOCKER_TAG
+FROM	$USER/$DISTRO-build:$DOCKER_TAG
+# Arguments used after FROM must be specified again
+ARG	DISTRO
 
 MAINTAINER Harald Welte <laforge at gnumonks.org>
 
@@ -7,22 +11,43 @@
 
 COPY	Release.key /tmp/Release.key
 
-RUN	apt-key add /tmp/Release.key && \
-	rm /tmp/Release.key && \
-	echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list
+RUN	case "$DISTRO" in \
+	debian*) \
+		apt-key add /tmp/Release.key && \
+		rm /tmp/Release.key && \
+		echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list; \
+		;; \
+	esac
 
 ADD	$OSMOCOM_REPO/Release /tmp/Release
-RUN	apt-get update && \
-	apt-get install -y --no-install-recommends \
-		telnet \
-		libosmocore-dev \
-		libosmo-abis-dev \
-		libosmo-netif-dev \
-		libosmo-sccp-dev \
-		libosmo-sigtran-dev \
-		libosmo-mgcp-client-dev \
-		libgtp-dev && \
-	apt-get clean
+RUN	case "$DISTRO" in \
+	debian*) \
+		apt-get update && \
+		apt-get install -y --no-install-recommends \
+			telnet \
+			libosmocore-dev \
+			libosmo-abis-dev \
+			libosmo-netif-dev \
+			libosmo-sccp-dev \
+			libosmo-sigtran-dev \
+			libosmo-mgcp-client-dev \
+			libgtp-dev && \
+		apt-get clean \
+		;; \
+	centos*) \
+		dnf install -y \
+			"pkgconfig(libosmo-mgcp-client)" \
+			"pkgconfig(libosmo-netif)" \
+			"pkgconfig(libosmo-sccp)" \
+			"pkgconfig(libosmo-sigtran)" \
+			"pkgconfig(libosmoabis)" \
+			"pkgconfig(libosmocore)" \
+			"pkgconfig(libosmoctrl)" \
+			"pkgconfig(libosmogb)" \
+			"pkgconfig(libosmogsm)" \
+			"pkgconfig(libosmovty)" \
+		;; \
+	esac
 
 WORKDIR	/tmp
 
diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile
index 9288469..bf490fb 100644
--- a/ttcn3-bsc-test/Dockerfile
+++ b/ttcn3-bsc-test/Dockerfile
@@ -1,5 +1,7 @@
 ARG	USER
-FROM	$USER/debian-stretch-titan
+ARG	DISTRO
+ARG	DOCKER_TAG
+FROM	$USER/$DISTRO-titan:$DOCKER_TAG
 
 RUN	mkdir /root/projects && (cd /root/projects && ln -sf / git)
 RUN	git clone git://git.osmocom.org/osmo-ttcn3-hacks.git
diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh
index 44badb5..1955e5f 100755
--- a/ttcn3-bsc-test/jenkins.sh
+++ b/ttcn3-bsc-test/jenkins.sh
@@ -3,11 +3,11 @@
 . ../jenkins-common.sh
 IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
 docker_images_require \
-	"debian-stretch-build" \
+	"$DISTRO-build" \
 	"osmo-stp-$IMAGE_SUFFIX" \
 	"osmo-bsc-$IMAGE_SUFFIX" \
 	"osmo-bts-$IMAGE_SUFFIX" \
-	"debian-stretch-titan" \
+	"$DISTRO-titan" \
 	"ttcn3-bsc-test"
 
 mkdir $VOL_BASE_DIR/bsc-tester
@@ -27,7 +27,7 @@
 		-v $VOL_BASE_DIR/stp:/data \
 		--name ${BUILD_TAG}-stp -d \
 		$DOCKER_ARGS \
-		$REPO_USER/osmo-stp-$IMAGE_SUFFIX
+		$REPO_USER/osmo-stp-$IMAGE_SUFFIX:$DOCKER_TAG
 
 echo Starting container with BSC
 docker run	--rm \
@@ -35,7 +35,7 @@
 		-v $VOL_BASE_DIR/bsc:/data \
 		--name ${BUILD_TAG}-bsc -d \
 		$DOCKER_ARGS \
-		$REPO_USER/osmo-bsc-$IMAGE_SUFFIX
+		$REPO_USER/osmo-bsc-$IMAGE_SUFFIX:$DOCKER_TAG
 
 for i in `seq 0 2`; do
 	echo Starting container with OML for BTS$i
@@ -43,7 +43,7 @@
 			--network $NET_NAME --ip 172.18.2.10$i \
 			--name ${BUILD_TAG}-bts$i -d \
 			$DOCKER_ARGS \
-			$REPO_USER/osmo-bts-$IMAGE_SUFFIX \
+			$REPO_USER/osmo-bts-$IMAGE_SUFFIX:$DOCKER_TAG \
 			/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"
 done
 
@@ -54,7 +54,7 @@
 		-v $VOL_BASE_DIR/bsc-tester:/data \
 		--name ${BUILD_TAG}-ttcn3-bsc-test \
 		$DOCKER_ARGS \
-		$REPO_USER/ttcn3-bsc-test
+		$REPO_USER/ttcn3-bsc-test:$DOCKER_TAG
 
 echo Stopping containers
 for i in `seq 0 2`; do

-- 
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/18575
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Ib717975ba4689d60d2dc5cbbd4f79ed8a78b03cd
Gerrit-Change-Number: 18575
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200529/64bf7eb2/attachment.htm>