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

[osmith]

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


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

*-pcu-*: support centos8

Related: OS#4564
Change-Id: I95d4987cefdb97295d15599f77860a766aba01f4
---
M osmo-pcu-master/Dockerfile
M ttcn3-pcu-test/Dockerfile
M ttcn3-pcu-test/jenkins-sns.sh
M ttcn3-pcu-test/jenkins.sh
4 files changed, 40 insertions(+), 18 deletions(-)



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

diff --git a/osmo-pcu-master/Dockerfile b/osmo-pcu-master/Dockerfile
index 1aed8c9..eaead34 100644
--- a/osmo-pcu-master/Dockerfile
+++ b/osmo-pcu-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,16 +11,32 @@
 
 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 && \
-	apt-get clean
+RUN	case "$DISTRO" in \
+	debian*) \
+		apt-get update && \
+		apt-get install -y --no-install-recommends \
+			telnet \
+			libosmocore-dev && \
+		apt-get clean \
+		;; \
+	centos*) \
+		dnf install -y \
+			telnet \
+			"pkgconfig(libosmocore)" \
+			"pkgconfig(libosmogb)" \
+			"pkgconfig(libosmogsm)" \
+			"pkgconfig(libosmovty)" \
+		;; \
+	esac
 
 ADD	respawn.sh /usr/local/bin/respawn.sh
 
diff --git a/ttcn3-pcu-test/Dockerfile b/ttcn3-pcu-test/Dockerfile
index b78fee2..a24c05f 100644
--- a/ttcn3-pcu-test/Dockerfile
+++ b/ttcn3-pcu-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-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh
index 06403d3..c7243bc 100755
--- a/ttcn3-pcu-test/jenkins-sns.sh
+++ b/ttcn3-pcu-test/jenkins-sns.sh
@@ -3,9 +3,9 @@
 . ../jenkins-common.sh
 IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
 docker_images_require \
-	"debian-stretch-build" \
+	"$DISTRO-build" \
 	"osmo-pcu-$IMAGE_SUFFIX" \
-	"debian-stretch-titan" \
+	"$DISTRO-titan" \
 	"ttcn3-pcu-test"
 
 network_create 172.18.14.0/24
@@ -27,7 +27,7 @@
 		-v $VOL_BASE_DIR/unix:/data/unix \
 		--name ${BUILD_TAG}-pcu-sns -d \
 		$DOCKER_ARGS \
-		$REPO_USER/osmo-pcu-$IMAGE_SUFFIX \
+		$REPO_USER/osmo-pcu-$IMAGE_SUFFIX:$DOCKER_TAG \
 		/bin/sh -c "/usr/local/bin/respawn.sh osmo-pcu -c /data/osmo-pcu.cfg -i 172.18.14.10 >>/data/osmo-pcu.log 2>&1"
 
 echo Starting container with PCU testsuite
@@ -38,7 +38,7 @@
 		-v $VOL_BASE_DIR/unix:/data/unix \
 		--name ${BUILD_TAG}-ttcn3-pcu-test-sns \
 		$DOCKER_ARGS \
-		$REPO_USER/ttcn3-pcu-test
+		$REPO_USER/ttcn3-pcu-test:$DOCKER_TAG
 
 echo Stopping containers
 docker container kill ${BUILD_TAG}-pcu-sns
diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh
index 271f89f..a68584f 100755
--- a/ttcn3-pcu-test/jenkins.sh
+++ b/ttcn3-pcu-test/jenkins.sh
@@ -3,9 +3,9 @@
 . ../jenkins-common.sh
 IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
 docker_images_require \
-	"debian-stretch-build" \
+	"$DISTRO-build" \
 	"osmo-pcu-$IMAGE_SUFFIX" \
-	"debian-stretch-titan" \
+	"$DISTRO-titan" \
 	"ttcn3-pcu-test"
 
 network_create 172.18.13.0/24
@@ -27,7 +27,7 @@
 		-v $VOL_BASE_DIR/unix:/data/unix \
 		--name ${BUILD_TAG}-pcu -d \
 		$DOCKER_ARGS \
-		$REPO_USER/osmo-pcu-$IMAGE_SUFFIX \
+		$REPO_USER/osmo-pcu-$IMAGE_SUFFIX:$DOCKER_TAG \
 		/bin/sh -c "/usr/local/bin/respawn.sh osmo-pcu -c /data/osmo-pcu.cfg -i 172.18.13.10 >>/data/osmo-pcu.log 2>&1"
 
 echo Starting container with PCU testsuite
@@ -38,7 +38,7 @@
 		-v $VOL_BASE_DIR/unix:/data/unix \
 		--name ${BUILD_TAG}-ttcn3-pcu-test \
 		$DOCKER_ARGS \
-		$REPO_USER/ttcn3-pcu-test
+		$REPO_USER/ttcn3-pcu-test:$DOCKER_TAG
 
 echo Stopping containers
 docker container kill ${BUILD_TAG}-pcu

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

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I95d4987cefdb97295d15599f77860a766aba01f4
Gerrit-Change-Number: 18569
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/5cb70fff/attachment.htm>