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

[osmith]

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


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

*-stp-*: support centos8

Related: OS#4564
Change-Id: Ie3e3c8645be40f4291e214a6843eb6aa30e77183
---
M osmo-stp-master/Dockerfile
M ttcn3-stp-test/Dockerfile
M ttcn3-stp-test/jenkins.sh
3 files changed, 37 insertions(+), 15 deletions(-)



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

diff --git a/osmo-stp-master/Dockerfile b/osmo-stp-master/Dockerfile
index 62bcbc7..af16cb1 100644
--- a/osmo-stp-master/Dockerfile
+++ b/osmo-stp-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,17 +11,33 @@
 
 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-netif-dev && \
-	apt-get clean
+RUN	case "$DISTRO" in \
+	debian*) \
+		apt-get update && \
+		apt-get install -y --no-install-recommends \
+			telnet \
+			libosmocore-dev \
+			libosmo-netif-dev && \
+		apt-get clean \
+		;; \
+	centos*) \
+		dnf install -y \
+			telnet \
+			"pkgconfig(libosmo-netif)" \
+			"pkgconfig(libosmocore)" \
+			"pkgconfig(libosmogsm)" \
+			"pkgconfig(libosmovty)" \
+		;; \
+	esac
 
 WORKDIR	/tmp
 
diff --git a/ttcn3-stp-test/Dockerfile b/ttcn3-stp-test/Dockerfile
index e6bb9d0..22ec24c 100644
--- a/ttcn3-stp-test/Dockerfile
+++ b/ttcn3-stp-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-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh
index bc2d5af..02b350e 100755
--- a/ttcn3-stp-test/jenkins.sh
+++ b/ttcn3-stp-test/jenkins.sh
@@ -3,9 +3,9 @@
 . ../jenkins-common.sh
 IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
 docker_images_require \
-	"debian-stretch-build" \
+	"$DISTRO-build" \
 	"osmo-stp-$IMAGE_SUFFIX" \
-	"debian-stretch-titan" \
+	"$DISTRO-titan" \
 	"ttcn3-stp-test"
 
 mkdir $VOL_BASE_DIR/stp-tester
@@ -22,7 +22,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 STP testsuite
 docker run	--rm \
@@ -31,7 +31,7 @@
 		-v $VOL_BASE_DIR/stp-tester:/data \
 		--name ${BUILD_TAG}-ttcn3-stp-test \
 		$DOCKER_ARGS \
-		$REPO_USER/ttcn3-stp-test
+		$REPO_USER/ttcn3-stp-test:$DOCKER_TAG
 
 docker container kill ${BUILD_TAG}-stp
 

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

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Ie3e3c8645be40f4291e214a6843eb6aa30e77183
Gerrit-Change-Number: 18571
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/cba109a3/attachment.htm>