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
This commit is contained in:
Oliver Smith 2020-05-30 08:40:57 +02:00
parent 3e3a298655
commit 9913f3896b
11 changed files with 421 additions and 163 deletions

View File

@ -1,5 +1,8 @@
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>
@ -7,22 +10,43 @@ 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-abis-dev \
libosmo-netif-dev \
libosmo-sccp-dev \
libosmo-sigtran-dev \
libosmo-mgcp-client-dev \
libgtp-dev && \
apt-get clean
RUN case "$DISTRO" in \
debian*) \
apt-get update && \
apt-get install -y --no-install-recommends \
telnet \
libosmocore-dev \
libosmo-abis-dev \
libosmo-netif-dev \
libosmo-sccp-dev \
libosmo-sigtran-dev \
libosmo-mgcp-client-dev \
libgtp-dev && \
apt-get clean \
;; \
centos*) \
dnf install -y \
"pkgconfig(libosmo-mgcp-client)" \
"pkgconfig(libosmo-netif)" \
"pkgconfig(libosmo-sccp)" \
"pkgconfig(libosmo-sigtran)" \
"pkgconfig(libosmoabis)" \
"pkgconfig(libosmocore)" \
"pkgconfig(libosmoctrl)" \
"pkgconfig(libosmogb)" \
"pkgconfig(libosmogsm)" \
"pkgconfig(libosmovty)" \
;; \
esac
WORKDIR /tmp

View File

@ -1,5 +1,8 @@
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>
@ -7,21 +10,42 @@ 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-abis-dev \
libosmo-netif-dev \
libosmo-sccp-dev \
libsmpp34-dev \
libgtp-dev && \
apt-get clean
RUN case "$DISTRO" in \
debian*) \
apt-get update && \
apt-get install -y --no-install-recommends \
telnet \
libosmocore-dev \
libosmo-abis-dev \
libosmo-netif-dev \
libosmo-sccp-dev \
libsmpp34-dev \
libgtp-dev && \
apt-get clean \
;; \
centos*) \
dnf install -y \
"pkgconfig(libosmoabis)" \
"pkgconfig(libosmocodec)" \
"pkgconfig(libosmocoding)" \
"pkgconfig(libosmocore)" \
"pkgconfig(libosmoctrl)" \
"pkgconfig(libosmogb)" \
"pkgconfig(libosmogsm)" \
"pkgconfig(libosmotrau)" \
"pkgconfig(libosmovty)" \
telnet \
;; \
esac
ADD respawn.sh /usr/local/bin/respawn.sh

View File

@ -1,5 +1,8 @@
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>
@ -7,16 +10,33 @@ 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 && \
apt-get clean
RUN case "$DISTRO" in \
debian*) \
apt-get update && \
apt-get install -y --no-install-recommends \
telnet \
libosmocore-dev && \
apt-get clean \
;; \
centos*) \
dnf install -y \
telnet \
"pkgconfig(libgtpnl)" \
"pkgconfig(libmnl)" \
"pkgconfig(libosmocore)" \
"pkgconfig(libosmoctrl)" \
"pkgconfig(libosmovty)" \
;; \
esac
WORKDIR /tmp

View File

@ -1,5 +1,8 @@
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>
@ -7,20 +10,38 @@ 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 \
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

View File

@ -1,5 +1,8 @@
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>
@ -7,19 +10,37 @@ 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-abis-dev \
libosmo-netif-dev \
libosmo-sccp-dev && \
apt-get clean
RUN case "$DISTRO" in \
debian*) \
apt-get update && \
apt-get install -y --no-install-recommends \
telnet \
libosmocore-dev \
libosmo-abis-dev \
libosmo-netif-dev \
libosmo-sccp-dev && \
apt-get clean \
;; \
centos*) \
dnf install -y \
telnet \
"pkgconfig(libosmo-netif)" \
"pkgconfig(libosmocore)" \
"pkgconfig(libosmoctrl)" \
"pkgconfig(libosmogsm)" \
"pkgconfig(libosmovty)" \
"pkgconfig(libosmocoding)" \
;; \
esac
WORKDIR /tmp

View File

@ -1,5 +1,8 @@
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>
@ -7,27 +10,52 @@ 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 \
libasn1c-dev \
libdbd-sqlite3 \
libdbi-dev \
libosmo-abis-dev \
libosmo-mgcp-client-dev \
libosmo-gsup-client-dev \
libosmo-netif-dev \
libosmo-ranap-dev \
libosmo-sccp-dev \
libosmo-sigtran-dev \
libosmocore-dev \
libsmpp34-dev \
telnet && \
apt-get clean
RUN case "$DISTRO" in \
debian*) \
apt-get update && \
apt-get install -y --no-install-recommends \
libasn1c-dev \
libdbd-sqlite3 \
libdbi-dev \
libosmo-abis-dev \
libosmo-mgcp-client-dev \
libosmo-gsup-client-dev \
libosmo-netif-dev \
libosmo-ranap-dev \
libosmo-sccp-dev \
libosmo-sigtran-dev \
libosmocore-dev \
libsmpp34-dev \
telnet && \
apt-get clean \
;; \
centos*) \
dnf install -y \
telnet \
"pkgconfig(libasn1c)" \
"pkgconfig(libosmo-gsup-client)" \
"pkgconfig(libosmo-mgcp-client)" \
"pkgconfig(libosmo-netif)" \
"pkgconfig(libosmo-ranap)" \
"pkgconfig(libosmo-sccp)" \
"pkgconfig(libosmo-sigtran)" \
"pkgconfig(libosmoabis)" \
"pkgconfig(libosmocore)" \
"pkgconfig(libosmoctrl)" \
"pkgconfig(libosmogsm)" \
"pkgconfig(libosmovty)" \
"pkgconfig(libsmpp34)" \
;; \
esac
WORKDIR /tmp

View File

@ -1,5 +1,8 @@
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>
@ -7,16 +10,32 @@ 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 && \
apt-get clean
RUN case "$DISTRO" in \
debian*) \
apt-get update && \
apt-get install -y --no-install-recommends \
telnet \
libosmocore-dev && \
apt-get clean \
;; \
centos*) \
dnf install -y \
telnet \
"pkgconfig(libosmocore)" \
"pkgconfig(libosmogb)" \
"pkgconfig(libosmogsm)" \
"pkgconfig(libosmovty)" \
;; \
esac
ADD respawn.sh /usr/local/bin/respawn.sh

View File

@ -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

View File

@ -1,5 +1,8 @@
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>
@ -7,25 +10,50 @@ 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-abis-dev \
libosmo-gsup-client-dev \
libosmo-netif-dev \
libosmo-ranap-dev \
libosmo-sccp-dev \
libosmo-sigtran-dev \
libsmpp34-dev \
libgtp-dev \
libasn1c-dev && \
apt-get clean
RUN case "$DISTRO" in \
debian*) \
apt-get update && \
apt-get install -y --no-install-recommends \
telnet \
libosmocore-dev \
libosmo-abis-dev \
libosmo-gsup-client-dev \
libosmo-netif-dev \
libosmo-ranap-dev \
libosmo-sccp-dev \
libosmo-sigtran-dev \
libsmpp34-dev \
libgtp-dev \
libasn1c-dev && \
apt-get clean \
;; \
centos*) \
dnf install -y \
telnet \
"pkgconfig(libasn1c)" \
"pkgconfig(libcrypto)" \
"pkgconfig(libgtp)" \
"pkgconfig(libosmo-gsup-client)" \
"pkgconfig(libosmo-netif)" \
"pkgconfig(libosmo-ranap)" \
"pkgconfig(libosmo-sigtran)" \
"pkgconfig(libosmoabis)" \
"pkgconfig(libosmocore)" \
"pkgconfig(libosmoctrl)" \
"pkgconfig(libosmogb)" \
"pkgconfig(libosmogsm)" \
"pkgconfig(libosmovty)" \
;; \
esac
WORKDIR /tmp

View File

@ -1,5 +1,8 @@
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>
@ -7,26 +10,42 @@ 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 \
libasn1c-dev \
libdbd-sqlite3 \
libdbi-dev \
libosmo-abis-dev \
libosmo-mgcp-client-dev \
libosmo-netif-dev \
libosmo-ranap-dev \
libosmo-sccp-dev \
libosmo-sigtran-dev \
libosmocore-dev \
libsmpp34-dev \
telnet && \
apt-get clean
RUN case "$DISTRO" in \
debian*) \
apt-get update && \
apt-get install -y --no-install-recommends \
libasn1c-dev \
libdbd-sqlite3 \
libdbi-dev \
libosmo-abis-dev \
libosmo-mgcp-client-dev \
libosmo-netif-dev \
libosmo-ranap-dev \
libosmo-sccp-dev \
libosmo-sigtran-dev \
libosmocore-dev \
libsmpp34-dev \
telnet && \
apt-get clean \
;; \
centos*) \
dnf install -y \
"pkgconfig(libosmocore)" \
"pkgconfig(libosmogsm)" \
"pkgconfig(libosmovty)" \
"pkgconfig(sofia-sip-ua-glib)" \
telnet \
;; \
esac
WORKDIR /tmp

View File

@ -1,5 +1,8 @@
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>
@ -7,17 +10,33 @@ 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-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