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/+/18570 )
Change subject: *-remsim-*: support centos8
......................................................................
*-remsim-*: support centos8
Related: OS#4564
Change-Id: I0eb4e3ad17eb9e7716d630eaa4ae61f860818ff6
---
M osmo-remsim-master/Dockerfile
M ttcn3-remsim-test/Dockerfile
M ttcn3-remsim-test/jenkins.sh
3 files changed, 69 insertions(+), 30 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/70/18570/1
diff --git a/osmo-remsim-master/Dockerfile b/osmo-remsim-master/Dockerfile
index 0a15d93..82e1ec3 100644
--- a/osmo-remsim-master/Dockerfile
+++ b/osmo-remsim-master/Dockerfile
@@ -1,17 +1,31 @@
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>
# PC/SC required for testing of bankd (with vpcd)
# autoconf, automake, libtool, pkg-config, m4, help2man required for virtualsmartcard
-RUN apt-get update && \
- apt-get install -y --no-install-recommends \
- libpcsclite-dev \
- pcscd \
- pcsc-tools \
- autoconf automake libtool pkg-config m4 help2man ca-certificates && \
- apt-get clean
+RUN case "$DISTRO" in \
+ debian*) \
+ apt-get update && \
+ apt-get install -y --no-install-recommends \
+ libpcsclite-dev \
+ pcscd \
+ pcsc-tools \
+ autoconf automake libtool pkg-config m4 help2man ca-certificates && \
+ apt-get clean \
+ ;; \
+ centos*) \
+ dnf install -y \
+ pcsc-lite \
+ help2man \
+ python3 \
+ ;; \
+ esac
# build virtualsmartcard
RUN git clone https://github.com/frankmorgner/vsmartcard.git
@@ -22,24 +36,46 @@
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-simtrace2-dev \
- libosmo-abis-dev \
- libosmo-netif-dev \
- libpcsclite-dev \
- libcsv-dev \
- libjansson-dev \
- libulfius-dev \
- liborcania-dev && \
- apt-get clean
+RUN case "$DISTRO" in \
+ debian*) \
+ apt-get update && \
+ apt-get install -y --no-install-recommends \
+ telnet \
+ libosmocore-dev \
+ libosmo-simtrace2-dev \
+ libosmo-abis-dev \
+ libosmo-netif-dev \
+ libpcsclite-dev \
+ libcsv-dev \
+ libjansson-dev \
+ libulfius-dev \
+ liborcania-dev && \
+ apt-get clean \
+ ;; \
+ centos*) \
+ dnf install -y \
+ telnet \
+ "pkgconfig(libasn1c)" \
+ "pkgconfig(libosmoabis)" \
+ "pkgconfig(libosmocore)" \
+ "pkgconfig(libosmogsm)" \
+ "pkgconfig(libosmosim)" \
+ "pkgconfig(libpcsclite)" \
+ "pkgconfig(libulfius)" \
+ "pkgconfig(libusb-1.0)" \
+ "pkgconfig(libosmousb)" \
+ "pkgconfig(libosmo-simtrace2)" \
+ ;; \
+ esac
#ADD respawn.sh /usr/local/bin/respawn.sh
diff --git a/ttcn3-remsim-test/Dockerfile b/ttcn3-remsim-test/Dockerfile
index b1ea71f..1cd9b44 100644
--- a/ttcn3-remsim-test/Dockerfile
+++ b/ttcn3-remsim-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-remsim-test/jenkins.sh b/ttcn3-remsim-test/jenkins.sh
index 1c2682c..fd4b73f 100755
--- a/ttcn3-remsim-test/jenkins.sh
+++ b/ttcn3-remsim-test/jenkins.sh
@@ -3,8 +3,9 @@
. ../jenkins-common.sh
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
docker_images_require \
- "debian-stretch-build" \
+ "$DISTRO-build" \
"osmo-remsim-$IMAGE_SUFFIX" \
+ "$DISTRO-titan" \
"ttcn3-remsim-test"
start_server() {
@@ -14,7 +15,7 @@
-v $VOL_BASE_DIR/server:/data \
--name ${BUILD_TAG}-server -d \
$DOCKER_ARGS \
- $REPO_USER/osmo-remsim-$IMAGE_SUFFIX \
+ $REPO_USER/osmo-remsim-$IMAGE_SUFFIX:$DOCKER_TAG \
/bin/sh -c "osmo-remsim-server >/data/osmo-remsim-server.log 2>&1"
}
@@ -25,7 +26,7 @@
-v $VOL_BASE_DIR/bankd:/data \
--name ${BUILD_TAG}-bankd -d \
$DOCKER_ARGS \
- $REPO_USER/osmo-remsim-$IMAGE_SUFFIX \
+ $REPO_USER/osmo-remsim-$IMAGE_SUFFIX:$DOCKER_TAG \
/bin/sh -c "pcscd; osmo-remsim-bankd -i 172.18.17.10 >/data/osmo-remsim-bankd.log 2>&1"
}
@@ -36,7 +37,7 @@
-v $VOL_BASE_DIR/client:/data \
--name ${BUILD_TAG}-client-d \
$DOCKER_ARGS \
- $REPO_USER/osmo-remsim-$IMAGE_SUFFIX \
+ $REPO_USER/osmo-remsim-$IMAGE_SUFFIX:$DOCKER_TAG \
/bin/sh -c "osmo-remsim-client-shell >/data/osmo-remsim-client.log 2>&1"
}
@@ -50,7 +51,7 @@
-v $VOL_BASE_DIR/remsim-tester:/data \
--name ${BUILD_TAG}-ttcn3-remsim-test \
$DOCKER_ARGS \
- $REPO_USER/ttcn3-remsim-test
+ $REPO_USER/ttcn3-remsim-test:$DOCKER_TAG
}
network_create 172.18.17.0/24
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/18570
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I0eb4e3ad17eb9e7716d630eaa4ae61f860818ff6
Gerrit-Change-Number: 18570
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/f0abaa16/attachment.htm>