osmo-*-latest: support centos8
Add a new centos8-obs-latest container with shared code (just like debian-stretch-obs-latest) and adjust the package install blocks in osmo-*-latest. Related: OS#5049 Change-Id: I274b31d4903df07e99fd434af25bdb72991f6923
This commit is contained in:
parent
effdb1a452
commit
69b3ecb912
|
@ -0,0 +1,21 @@
|
||||||
|
ARG REGISTRY=docker.io
|
||||||
|
ARG UPSTREAM_DISTRO=centos:centos8
|
||||||
|
FROM ${REGISTRY}/${UPSTREAM_DISTRO}
|
||||||
|
# Arguments used after FROM must be specified again
|
||||||
|
ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
|
||||||
|
|
||||||
|
# Let package metadata expire after 60 seconds instead of 48 hours
|
||||||
|
RUN echo "metadata_expire=60" >> /etc/dnf/dnf.conf && cat /etc/dnf/dnf.conf
|
||||||
|
|
||||||
|
# Make additional development libraries available from PowerTools and set up
|
||||||
|
# Osmocom latest OBS repository
|
||||||
|
RUN dnf install -y dnf-utils wget && \
|
||||||
|
yum config-manager --set-enabled powertools && \
|
||||||
|
cd /etc/yum.repos.d/ && \
|
||||||
|
wget $OSMOCOM_REPO_MIRROR/repositories/network:osmocom:latest/CentOS_8/network:osmocom:latest.repo
|
||||||
|
|
||||||
|
RUN dnf install -y \
|
||||||
|
telnet
|
||||||
|
|
||||||
|
# Invalidate cache once the repository is updated
|
||||||
|
ADD $OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/CentOS_8/repodata/repomd.xml /tmp/repomd.xml
|
|
@ -0,0 +1,3 @@
|
||||||
|
UPSTREAM_DISTRO:=centos:centos8
|
||||||
|
DISTRO:=centos8
|
||||||
|
include ../make/Makefile
|
|
@ -7,6 +7,7 @@ docker_image_exists() {
|
||||||
|
|
||||||
docker_depends() {
|
docker_depends() {
|
||||||
case "$1" in
|
case "$1" in
|
||||||
|
osmo-*-latest-centos8) echo "centos8-obs-latest" ;;
|
||||||
osmo-*-centos8) echo "centos8-build" ;;
|
osmo-*-centos8) echo "centos8-build" ;;
|
||||||
osmo-*-latest) echo "debian-stretch-obs-latest" ;;
|
osmo-*-latest) echo "debian-stretch-obs-latest" ;;
|
||||||
osmo-*) echo "debian-stretch-build" ;;
|
osmo-*) echo "debian-stretch-build" ;;
|
||||||
|
|
|
@ -2,12 +2,22 @@ ARG USER
|
||||||
ARG DISTRO
|
ARG DISTRO
|
||||||
FROM $USER/$DISTRO-obs-latest
|
FROM $USER/$DISTRO-obs-latest
|
||||||
# Arguments used after FROM must be specified again
|
# Arguments used after FROM must be specified again
|
||||||
|
ARG DISTRO
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN case "$DISTRO" in \
|
||||||
apt-get install -y --no-install-recommends \
|
debian*) \
|
||||||
osmo-bsc \
|
apt-get update && \
|
||||||
osmo-bsc-ipaccess-utils && \
|
apt-get install -y --no-install-recommends \
|
||||||
apt-get clean
|
osmo-bsc \
|
||||||
|
osmo-bsc-ipaccess-utils && \
|
||||||
|
apt-get clean \
|
||||||
|
;; \
|
||||||
|
centos*) \
|
||||||
|
dnf install -y \
|
||||||
|
osmo-bsc \
|
||||||
|
osmo-bsc-ipaccess-utils \
|
||||||
|
;; \
|
||||||
|
esac
|
||||||
|
|
||||||
WORKDIR /tmp
|
WORKDIR /tmp
|
||||||
|
|
||||||
|
|
|
@ -2,12 +2,22 @@ ARG USER
|
||||||
ARG DISTRO
|
ARG DISTRO
|
||||||
FROM $USER/$DISTRO-obs-latest
|
FROM $USER/$DISTRO-obs-latest
|
||||||
# Arguments used after FROM must be specified again
|
# Arguments used after FROM must be specified again
|
||||||
|
ARG DISTRO
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN case "$DISTRO" in \
|
||||||
apt-get install -y --no-install-recommends \
|
debian*) \
|
||||||
osmo-bts-trx \
|
apt-get update && \
|
||||||
osmo-bts-virtual && \
|
apt-get install -y --no-install-recommends \
|
||||||
apt-get clean
|
osmo-bts-trx \
|
||||||
|
osmo-bts-virtual && \
|
||||||
|
apt-get clean \
|
||||||
|
;; \
|
||||||
|
centos*) \
|
||||||
|
dnf install -y \
|
||||||
|
osmo-bts \
|
||||||
|
osmo-bts-virtual \
|
||||||
|
;; \
|
||||||
|
esac
|
||||||
|
|
||||||
ADD respawn.sh /usr/local/bin/respawn.sh
|
ADD respawn.sh /usr/local/bin/respawn.sh
|
||||||
|
|
||||||
|
|
|
@ -2,11 +2,20 @@ ARG USER
|
||||||
ARG DISTRO
|
ARG DISTRO
|
||||||
FROM $USER/$DISTRO-obs-latest
|
FROM $USER/$DISTRO-obs-latest
|
||||||
# Arguments used after FROM must be specified again
|
# Arguments used after FROM must be specified again
|
||||||
|
ARG DISTRO
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN case "$DISTRO" in \
|
||||||
apt-get install -y --no-install-recommends \
|
debian*) \
|
||||||
osmo-cbc && \
|
apt-get update && \
|
||||||
apt-get clean
|
apt-get install -y --no-install-recommends \
|
||||||
|
osmo-cbc && \
|
||||||
|
apt-get clean \
|
||||||
|
;; \
|
||||||
|
centos*) \
|
||||||
|
dnf install -y \
|
||||||
|
osmo-cbc \
|
||||||
|
;; \
|
||||||
|
esac
|
||||||
|
|
||||||
WORKDIR /data
|
WORKDIR /data
|
||||||
|
|
||||||
|
|
|
@ -2,6 +2,7 @@ ARG USER
|
||||||
ARG DISTRO
|
ARG DISTRO
|
||||||
FROM $USER/$DISTRO-obs-latest
|
FROM $USER/$DISTRO-obs-latest
|
||||||
# Arguments used after FROM must be specified again
|
# Arguments used after FROM must be specified again
|
||||||
|
ARG DISTRO
|
||||||
|
|
||||||
RUN case "$DISTRO" in \
|
RUN case "$DISTRO" in \
|
||||||
debian*) \
|
debian*) \
|
||||||
|
|
|
@ -2,28 +2,38 @@ ARG USER
|
||||||
ARG DISTRO
|
ARG DISTRO
|
||||||
FROM $USER/$DISTRO-obs-latest
|
FROM $USER/$DISTRO-obs-latest
|
||||||
# Arguments used after FROM must be specified again
|
# Arguments used after FROM must be specified again
|
||||||
|
ARG DISTRO
|
||||||
|
|
||||||
|
# Install additional debian depends for kernel module test (OS#3208)
|
||||||
# Disable update-initramfs to save time during apt-get install
|
# Disable update-initramfs to save time during apt-get install
|
||||||
RUN ln -s /bin/true /usr/local/bin/update-initramfs && \
|
RUN case "$DISTRO" in \
|
||||||
apt-get update && \
|
debian*) \
|
||||||
apt-get install -y --no-install-recommends \
|
ln -s /bin/true /usr/local/bin/update-initramfs && \
|
||||||
bc \
|
apt-get update && \
|
||||||
bison \
|
apt-get install -y --no-install-recommends \
|
||||||
bridge-utils \
|
bc \
|
||||||
busybox-static \
|
bison \
|
||||||
ca-certificates \
|
bridge-utils \
|
||||||
flex \
|
busybox-static \
|
||||||
gcc \
|
ca-certificates \
|
||||||
git \
|
flex \
|
||||||
libc6-dev \
|
gcc \
|
||||||
libelf-dev \
|
git \
|
||||||
libssl-dev \
|
libc6-dev \
|
||||||
linux-image-amd64 \
|
libelf-dev \
|
||||||
make \
|
libssl-dev \
|
||||||
osmo-ggsn \
|
linux-image-amd64 \
|
||||||
pax-utils \
|
make \
|
||||||
qemu-system-x86 && \
|
osmo-ggsn \
|
||||||
apt-get clean
|
pax-utils \
|
||||||
|
qemu-system-x86 && \
|
||||||
|
apt-get clean \
|
||||||
|
;; \
|
||||||
|
centos*) \
|
||||||
|
dnf install -y \
|
||||||
|
osmo-ggsn \
|
||||||
|
;; \
|
||||||
|
esac
|
||||||
|
|
||||||
WORKDIR /tmp
|
WORKDIR /tmp
|
||||||
|
|
||||||
|
|
|
@ -2,12 +2,21 @@ ARG USER
|
||||||
ARG DISTRO
|
ARG DISTRO
|
||||||
FROM $USER/$DISTRO-obs-latest
|
FROM $USER/$DISTRO-obs-latest
|
||||||
# Arguments used after FROM must be specified again
|
# Arguments used after FROM must be specified again
|
||||||
|
ARG DISTRO
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN case "$DISTRO" in \
|
||||||
apt-get install -y --no-install-recommends \
|
debian*) \
|
||||||
libdbd-sqlite3 \
|
apt-get update && \
|
||||||
osmo-hlr && \
|
apt-get install -y --no-install-recommends \
|
||||||
apt-get clean
|
libdbd-sqlite3 \
|
||||||
|
osmo-hlr && \
|
||||||
|
apt-get clean \
|
||||||
|
;; \
|
||||||
|
centos*) \
|
||||||
|
dnf install -y \
|
||||||
|
osmo-hlr \
|
||||||
|
;; \
|
||||||
|
esac
|
||||||
|
|
||||||
WORKDIR /tmp
|
WORKDIR /tmp
|
||||||
|
|
||||||
|
|
|
@ -2,11 +2,20 @@ ARG USER
|
||||||
ARG DISTRO
|
ARG DISTRO
|
||||||
FROM $USER/$DISTRO-obs-latest
|
FROM $USER/$DISTRO-obs-latest
|
||||||
# Arguments used after FROM must be specified again
|
# Arguments used after FROM must be specified again
|
||||||
|
ARG DISTRO
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN case "$DISTRO" in \
|
||||||
apt-get install -y --no-install-recommends \
|
debian*) \
|
||||||
osmo-mgw && \
|
apt-get update && \
|
||||||
apt-get clean
|
apt-get install -y --no-install-recommends \
|
||||||
|
osmo-mgw && \
|
||||||
|
apt-get clean \
|
||||||
|
;; \
|
||||||
|
centos*) \
|
||||||
|
dnf install -y \
|
||||||
|
osmo-mgw \
|
||||||
|
;; \
|
||||||
|
esac
|
||||||
|
|
||||||
WORKDIR /tmp
|
WORKDIR /tmp
|
||||||
|
|
||||||
|
|
|
@ -2,11 +2,20 @@ ARG USER
|
||||||
ARG DISTRO
|
ARG DISTRO
|
||||||
FROM $USER/$DISTRO-obs-latest
|
FROM $USER/$DISTRO-obs-latest
|
||||||
# Arguments used after FROM must be specified again
|
# Arguments used after FROM must be specified again
|
||||||
|
ARG DISTRO
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN case "$DISTRO" in \
|
||||||
apt-get install -y --no-install-recommends \
|
debian*) \
|
||||||
osmo-msc && \
|
apt-get update && \
|
||||||
apt-get clean
|
apt-get install -y --no-install-recommends \
|
||||||
|
osmo-msc && \
|
||||||
|
apt-get clean \
|
||||||
|
;; \
|
||||||
|
centos*) \
|
||||||
|
dnf install -y \
|
||||||
|
osmo-msc \
|
||||||
|
;; \
|
||||||
|
esac
|
||||||
|
|
||||||
WORKDIR /tmp
|
WORKDIR /tmp
|
||||||
|
|
||||||
|
|
|
@ -2,6 +2,7 @@ ARG USER
|
||||||
ARG DISTRO
|
ARG DISTRO
|
||||||
FROM $USER/$DISTRO-obs-latest
|
FROM $USER/$DISTRO-obs-latest
|
||||||
# Arguments used after FROM must be specified again
|
# Arguments used after FROM must be specified again
|
||||||
|
ARG DISTRO
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get install -y --no-install-recommends \
|
apt-get install -y --no-install-recommends \
|
||||||
|
|
|
@ -2,11 +2,20 @@ ARG USER
|
||||||
ARG DISTRO
|
ARG DISTRO
|
||||||
FROM $USER/$DISTRO-obs-latest
|
FROM $USER/$DISTRO-obs-latest
|
||||||
# Arguments used after FROM must be specified again
|
# Arguments used after FROM must be specified again
|
||||||
|
ARG DISTRO
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN case "$DISTRO" in \
|
||||||
apt-get install -y --no-install-recommends \
|
debian*) \
|
||||||
osmo-pcu && \
|
apt-get update && \
|
||||||
apt-get clean
|
apt-get install -y --no-install-recommends \
|
||||||
|
osmo-pcu && \
|
||||||
|
apt-get clean \
|
||||||
|
;; \
|
||||||
|
centos*) \
|
||||||
|
dnf install -y \
|
||||||
|
osmo-pcu \
|
||||||
|
;; \
|
||||||
|
esac
|
||||||
|
|
||||||
ADD respawn.sh /usr/local/bin/respawn.sh
|
ADD respawn.sh /usr/local/bin/respawn.sh
|
||||||
|
|
||||||
|
|
|
@ -2,11 +2,20 @@ ARG USER
|
||||||
ARG DISTRO
|
ARG DISTRO
|
||||||
FROM $USER/$DISTRO-obs-latest
|
FROM $USER/$DISTRO-obs-latest
|
||||||
# Arguments used after FROM must be specified again
|
# Arguments used after FROM must be specified again
|
||||||
|
ARG DISTRO
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN case "$DISTRO" in \
|
||||||
apt-get install -y --no-install-recommends \
|
debian*) \
|
||||||
osmo-sgsn && \
|
apt-get update && \
|
||||||
apt-get clean
|
apt-get install -y --no-install-recommends \
|
||||||
|
osmo-sgsn && \
|
||||||
|
apt-get clean \
|
||||||
|
;; \
|
||||||
|
centos*) \
|
||||||
|
dnf install -y \
|
||||||
|
osmo-sgsn \
|
||||||
|
;; \
|
||||||
|
esac
|
||||||
|
|
||||||
WORKDIR /tmp
|
WORKDIR /tmp
|
||||||
|
|
||||||
|
|
|
@ -2,11 +2,20 @@ ARG USER
|
||||||
ARG DISTRO
|
ARG DISTRO
|
||||||
FROM $USER/$DISTRO-obs-latest
|
FROM $USER/$DISTRO-obs-latest
|
||||||
# Arguments used after FROM must be specified again
|
# Arguments used after FROM must be specified again
|
||||||
|
ARG DISTRO
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN case "$DISTRO" in \
|
||||||
apt-get install -y --no-install-recommends \
|
debian*) \
|
||||||
osmo-sip-connector && \
|
apt-get update && \
|
||||||
apt-get clean
|
apt-get install -y --no-install-recommends \
|
||||||
|
osmo-sip-connector && \
|
||||||
|
apt-get clean \
|
||||||
|
;; \
|
||||||
|
centos*) \
|
||||||
|
dnf install -y \
|
||||||
|
osmo-sip-connector \
|
||||||
|
;; \
|
||||||
|
esac
|
||||||
|
|
||||||
WORKDIR /tmp
|
WORKDIR /tmp
|
||||||
|
|
||||||
|
|
|
@ -2,11 +2,20 @@ ARG USER
|
||||||
ARG DISTRO
|
ARG DISTRO
|
||||||
FROM $USER/$DISTRO-obs-latest
|
FROM $USER/$DISTRO-obs-latest
|
||||||
# Arguments used after FROM must be specified again
|
# Arguments used after FROM must be specified again
|
||||||
|
ARG DISTRO
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN case "$DISTRO" in \
|
||||||
apt-get install -y --no-install-recommends \
|
debian*) \
|
||||||
osmo-smlc && \
|
apt-get update && \
|
||||||
apt-get clean
|
apt-get install -y --no-install-recommends \
|
||||||
|
osmo-smlc && \
|
||||||
|
apt-get clean \
|
||||||
|
;; \
|
||||||
|
centos*) \
|
||||||
|
dnf install -y \
|
||||||
|
osmo-smlc \
|
||||||
|
;; \
|
||||||
|
esac
|
||||||
|
|
||||||
WORKDIR /data
|
WORKDIR /data
|
||||||
|
|
||||||
|
|
|
@ -2,11 +2,20 @@ ARG USER
|
||||||
ARG DISTRO
|
ARG DISTRO
|
||||||
FROM $USER/$DISTRO-obs-latest
|
FROM $USER/$DISTRO-obs-latest
|
||||||
# Arguments used after FROM must be specified again
|
# Arguments used after FROM must be specified again
|
||||||
|
ARG DISTRO
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN case "$DISTRO" in \
|
||||||
apt-get install -y --no-install-recommends \
|
debian*) \
|
||||||
osmo-stp && \
|
apt-get update && \
|
||||||
apt-get clean
|
apt-get install -y --no-install-recommends \
|
||||||
|
osmo-stp && \
|
||||||
|
apt-get clean \
|
||||||
|
;; \
|
||||||
|
centos*) \
|
||||||
|
dnf install -y \
|
||||||
|
osmo-stp \
|
||||||
|
;; \
|
||||||
|
esac
|
||||||
|
|
||||||
WORKDIR /data
|
WORKDIR /data
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue