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

[osmith]

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


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

*-sccp-*: support centos8

Related: OS#4564
Change-Id: I51c8f5ae6ae136a3b33aca667ed01cae15d9577a
---
M ttcn3-sccp-test/Dockerfile
M ttcn3-sccp-test/jenkins.sh
2 files changed, 7 insertions(+), 5 deletions(-)



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

diff --git a/ttcn3-sccp-test/Dockerfile b/ttcn3-sccp-test/Dockerfile
index d9c3232..d2d8e96 100644
--- a/ttcn3-sccp-test/Dockerfile
+++ b/ttcn3-sccp-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-sccp-test/jenkins.sh b/ttcn3-sccp-test/jenkins.sh
index 242e44a..c9a86c9 100755
--- a/ttcn3-sccp-test/jenkins.sh
+++ b/ttcn3-sccp-test/jenkins.sh
@@ -4,9 +4,9 @@
 IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
 # Always require osmo-stp-master since is the only with sccp_demo_user installed
 docker_images_require \
-	"debian-stretch-build" \
+	"$DISTRO-build" \
 	"osmo-stp-master" \
-	"debian-stretch-titan" \
+	"$DISTRO-titan" \
 	"ttcn3-sccp-test"
 
 mkdir $VOL_BASE_DIR/sccp-tester
@@ -23,7 +23,7 @@
 		-v $VOL_BASE_DIR/sccp:/data \
 		--name ${BUILD_TAG}-stp -d \
 		$DOCKER_ARGS \
-		$REPO_USER/osmo-stp-master \
+		$REPO_USER/osmo-stp-master:$DOCKER_TAG \
 		/bin/sh -c "sccp_demo_user -l 172.18.22.200 -r 172.18.22.203 -C /data/sccp_demo_user.cfg >>/data/sccp_demo_user.log 2>&1"
 
 
@@ -34,7 +34,7 @@
 		-v $VOL_BASE_DIR/sccp-tester:/data \
 		--name ${BUILD_TAG}-ttcn3-sccp-test \
 		$DOCKER_ARGS \
-		$REPO_USER/ttcn3-sccp-test
+		$REPO_USER/ttcn3-sccp-test:$DOCKER_TAG
 
 docker container kill ${BUILD_TAG}-stp
 

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

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I51c8f5ae6ae136a3b33aca667ed01cae15d9577a
Gerrit-Change-Number: 18572
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/71b057a7/attachment.htm>