diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2020-05-30 08:40:57 +0200 |
|---|---|---|
| committer | Oliver Smith <osmith@sysmocom.de> | 2020-05-30 09:28:34 +0200 |
| commit | 9913f3896b788ed6ecfc0acea002fc89a0f452e4 (patch) | |
| tree | 20fda2846f99ce0342a78cf2998e2193159a62c2 /osmo-remsim-master | |
| parent | 3e3a29865551561a9e9eb4f24e2b89875c74e9e8 (diff) | |
osmo-*-master: support centos8
Adjust the Dockerfiles, so 'docker_images_require osmo-mgw-master-centos8'
etc. result in a centos8 based image. centos8-build already configures the
Osmocom nightly repository, so we only need to configure it for
debian-stretch.
Related: OS#4564
Change-Id: I6579748056ce0505304378b342a698b98c77fd18
Diffstat (limited to 'osmo-remsim-master')
| -rw-r--r-- | osmo-remsim-master/Dockerfile | 83 |
1 files changed, 59 insertions, 24 deletions
diff --git a/osmo-remsim-master/Dockerfile b/osmo-remsim-master/Dockerfile index 0a15d93..bed7f47 100644 --- a/osmo-remsim-master/Dockerfile +++ b/osmo-remsim-master/Dockerfile @@ -1,17 +1,30 @@ ARG USER -FROM $USER/debian-stretch-build +ARG DISTRO +FROM $USER/$DISTRO-build +# Arguments used after FROM must be specified again +ARG DISTRO MAINTAINER Harald Welte <laforge@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 +35,46 @@ ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/ni 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 |