This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
osmith gerrit-no-reply at lists.osmocom.orgosmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/18568 ) Change subject: *-hlr-*: support centos8 ...................................................................... *-hlr-*: support centos8 Related: OS#4564 Change-Id: Ie701be46e3b7ab5ee8840060693bd3635abb940f --- M osmo-hlr-master/Dockerfile M ttcn3-hlr-test/Dockerfile M ttcn3-hlr-test/jenkins.sh 3 files changed, 42 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/68/18568/1 diff --git a/osmo-hlr-master/Dockerfile b/osmo-hlr-master/Dockerfile index 3aa8468..e1fe930 100644 --- a/osmo-hlr-master/Dockerfile +++ b/osmo-hlr-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,20 +11,38 @@ 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 \ - libdbd-sqlite3 \ - libosmo-abis-dev \ - libosmo-netif-dev \ - libosmo-sigtran-dev \ - libosmocore-dev \ - telnet && \ - apt-get clean +RUN case "$DISTRO" in \ + debian*) \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + libdbd-sqlite3 \ + libosmo-abis-dev \ + libosmo-netif-dev \ + libosmo-sigtran-dev \ + libosmocore-dev \ + telnet && \ + apt-get clean \ + ;; \ + centos*) \ + dnf install -y \ + "pkgconfig(libosmoabis)" \ + "pkgconfig(libosmocore)" \ + "pkgconfig(libosmoctrl)" \ + "pkgconfig(libosmogsm)" \ + "pkgconfig(libosmovty)" \ + python3 \ + telnet \ + ;; \ + esac WORKDIR /tmp diff --git a/ttcn3-hlr-test/Dockerfile b/ttcn3-hlr-test/Dockerfile index 0233035..7b797e7 100644 --- a/ttcn3-hlr-test/Dockerfile +++ b/ttcn3-hlr-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-hlr-test/jenkins.sh b/ttcn3-hlr-test/jenkins.sh index 47ce5a9..474cdac 100755 --- a/ttcn3-hlr-test/jenkins.sh +++ b/ttcn3-hlr-test/jenkins.sh @@ -3,9 +3,9 @@ . ../jenkins-common.sh IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" docker_images_require \ - "debian-stretch-build" \ + "$DISTRO-build" \ "osmo-hlr-$IMAGE_SUFFIX" \ - "debian-stretch-titan" \ + "$DISTRO-titan" \ "ttcn3-hlr-test" network_create 172.18.10.0/24 @@ -28,7 +28,7 @@ -v $VOL_BASE_DIR/hlr:/data \ --name ${BUILD_TAG}-hlr -d \ $DOCKER_ARGS \ - $REPO_USER/osmo-hlr-$IMAGE_SUFFIX \ + $REPO_USER/osmo-hlr-$IMAGE_SUFFIX:$DOCKER_TAG \ /bin/sh -c "osmo-hlr -c /data/osmo-hlr.cfg >/data/osmo-hlr.log 2>&1" echo Starting container with HLR testsuite @@ -38,7 +38,7 @@ -v $VOL_BASE_DIR/hlr-tester:/data \ --name ${BUILD_TAG}-ttcn3-hlr-test \ $DOCKER_ARGS \ - $REPO_USER/ttcn3-hlr-test + $REPO_USER/ttcn3-hlr-test:$DOCKER_TAG echo Stopping containers docker container kill ${BUILD_TAG}-hlr -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/18568 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie701be46e3b7ab5ee8840060693bd3635abb940f Gerrit-Change-Number: 18568 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/6d6a627e/attachment.htm>