<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/26497">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Add centos7 containers<br><br>Related: SYS#5754<br>Change-Id: Iadf3d0d7143c2d81ea5e87fd07a3f4cd9239cb46<br>---<br>A centos7-build/Dockerfile<br>A centos7-build/Makefile<br>A centos7-obs-latest/Dockerfile<br>A centos7-obs-latest/Makefile<br>M jenkins-common.sh<br>5 files changed, 115 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/97/26497/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/centos7-build/Dockerfile b/centos7-build/Dockerfile</span><br><span>new file mode 100644</span><br><span>index 0000000..2e04efb</span><br><span>--- /dev/null</span><br><span>+++ b/centos7-build/Dockerfile</span><br><span>@@ -0,0 +1,65 @@</span><br><span style="color: hsl(120, 100%, 40%);">+ARG REGISTRY=docker.io</span><br><span style="color: hsl(120, 100%, 40%);">+ARG UPSTREAM_DISTRO=centos:centos7</span><br><span style="color: hsl(120, 100%, 40%);">+FROM ${REGISTRY}/${UPSTREAM_DISTRO}</span><br><span style="color: hsl(120, 100%, 40%);">+# Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Use dnf package manager instead of yum, so we can use all the dnf codepaths</span><br><span style="color: hsl(120, 100%, 40%);">+# that were originally written for CentOS8 in this CentOS7 image too</span><br><span style="color: hsl(120, 100%, 40%);">+RUN yum install -y dnf</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Let package metadata expire after 60 seconds instead of 48 hours</span><br><span style="color: hsl(120, 100%, 40%);">+RUN echo "metadata_expire=60" >> /etc/dnf/dnf.conf && cat /etc/dnf/dnf.conf</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Set up Osmocom OBS repository</span><br><span style="color: hsl(120, 100%, 40%);">+RUN export MIRROR_HTTPS="$(echo $OSMOCOM_REPO_MIRROR | sed s/^http:/https:/)" && \</span><br><span style="color: hsl(120, 100%, 40%);">+ { echo "[network_osmocom_nightly]"; \</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "name=Nightly packages of the Osmocom project (CentOS_7)"; \</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "type=rpm-md"; \</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "baseurl=${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/nightly/CentOS_7/"; \</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "gpgcheck=1"; \</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "gpgkey=${MIRROR_HTTPS}/${OSMOCOM_REPO_PATH}/nightly/CentOS_7/repodata/repomd.xml.key"; \</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "enabled=1"; \</span><br><span style="color: hsl(120, 100%, 40%);">+ } > /etc/yum.repos.d/network:osmocom:nightly.repo</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+RUN dnf install -y \</span><br><span style="color: hsl(120, 100%, 40%);">+ autoconf \</span><br><span style="color: hsl(120, 100%, 40%);">+ autoconf-archive \</span><br><span style="color: hsl(120, 100%, 40%);">+ autogen \</span><br><span style="color: hsl(120, 100%, 40%);">+ automake \</span><br><span style="color: hsl(120, 100%, 40%);">+ bison \</span><br><span style="color: hsl(120, 100%, 40%);">+ c-ares-devel \</span><br><span style="color: hsl(120, 100%, 40%);">+ doxygen \</span><br><span style="color: hsl(120, 100%, 40%);">+ fftw-devel \</span><br><span style="color: hsl(120, 100%, 40%);">+ flex \</span><br><span style="color: hsl(120, 100%, 40%);">+ gawk \</span><br><span style="color: hsl(120, 100%, 40%);">+ gcc \</span><br><span style="color: hsl(120, 100%, 40%);">+ gcc-c++ \</span><br><span style="color: hsl(120, 100%, 40%);">+ git \</span><br><span style="color: hsl(120, 100%, 40%);">+ gnupg \</span><br><span style="color: hsl(120, 100%, 40%);">+ gnutls-devel \</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm-devel \</span><br><span style="color: hsl(120, 100%, 40%);">+ libdbi-dbd-sqlite \</span><br><span style="color: hsl(120, 100%, 40%);">+ libdbi-devel \</span><br><span style="color: hsl(120, 100%, 40%);">+ libpcap-devel \</span><br><span style="color: hsl(120, 100%, 40%);">+ libtalloc-devel \</span><br><span style="color: hsl(120, 100%, 40%);">+ libtool \</span><br><span style="color: hsl(120, 100%, 40%);">+ libusb1-devel \</span><br><span style="color: hsl(120, 100%, 40%);">+ lksctp-tools-devel \</span><br><span style="color: hsl(120, 100%, 40%);">+ make \</span><br><span style="color: hsl(120, 100%, 40%);">+ ncurses-devel \</span><br><span style="color: hsl(120, 100%, 40%);">+ openssl-devel \</span><br><span style="color: hsl(120, 100%, 40%);">+ ortp-devel \</span><br><span style="color: hsl(120, 100%, 40%);">+ pcsc-lite-devel \</span><br><span style="color: hsl(120, 100%, 40%);">+ pkgconfig \</span><br><span style="color: hsl(120, 100%, 40%);">+ readline-devel \</span><br><span style="color: hsl(120, 100%, 40%);">+ sqlite \</span><br><span style="color: hsl(120, 100%, 40%);">+ sqlite-devel \</span><br><span style="color: hsl(120, 100%, 40%);">+ telnet</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Make respawn.sh part of this image, so it can be used by other images based on it</span><br><span style="color: hsl(120, 100%, 40%);">+COPY .common/respawn.sh /usr/local/bin/respawn.sh</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Invalidate cache once the repository is updated</span><br><span style="color: hsl(120, 100%, 40%);">+ADD ${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/nightly/CentOS_7/repodata/repomd.xml /tmp/repomd.xml</span><br><span>diff --git a/centos7-build/Makefile b/centos7-build/Makefile</span><br><span>new file mode 100644</span><br><span>index 0000000..cba5cee</span><br><span>--- /dev/null</span><br><span>+++ b/centos7-build/Makefile</span><br><span>@@ -0,0 +1,3 @@</span><br><span style="color: hsl(120, 100%, 40%);">+UPSTREAM_DISTRO:=centos:centos8</span><br><span style="color: hsl(120, 100%, 40%);">+DISTRO:=centos8</span><br><span style="color: hsl(120, 100%, 40%);">+include ../make/Makefile</span><br><span>diff --git a/centos7-obs-latest/Dockerfile b/centos7-obs-latest/Dockerfile</span><br><span>new file mode 100644</span><br><span>index 0000000..dfe12fc</span><br><span>--- /dev/null</span><br><span>+++ b/centos7-obs-latest/Dockerfile</span><br><span>@@ -0,0 +1,34 @@</span><br><span style="color: hsl(120, 100%, 40%);">+ARG REGISTRY=docker.io</span><br><span style="color: hsl(120, 100%, 40%);">+ARG UPSTREAM_DISTRO=centos:centos7</span><br><span style="color: hsl(120, 100%, 40%);">+FROM ${REGISTRY}/${UPSTREAM_DISTRO}</span><br><span style="color: hsl(120, 100%, 40%);">+# Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_VERSION="latest"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Use dnf package manager instead of yum, so we can use all the dnf codepaths</span><br><span style="color: hsl(120, 100%, 40%);">+# that were originally written for CentOS8 in this CentOS7 image too</span><br><span style="color: hsl(120, 100%, 40%);">+RUN yum install -y dnf</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Let package metadata expire after 60 seconds instead of 48 hours</span><br><span style="color: hsl(120, 100%, 40%);">+RUN echo "metadata_expire=60" >> /etc/dnf/dnf.conf && cat /etc/dnf/dnf.conf</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Set up Osmocom OBS repository</span><br><span style="color: hsl(120, 100%, 40%);">+RUN export MIRROR_HTTPS="$(echo $OSMOCOM_REPO_MIRROR | sed s/^http:/https:/)" && \</span><br><span style="color: hsl(120, 100%, 40%);">+ { echo "[network_osmocom_${OSMOCOM_REPO_VERSION}]"; \</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "name=Osmocom ${OSMOCOM_REPO_VERSION}"; \</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "type=rpm-md"; \</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "baseurl=${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/${OSMOCOM_REPO_VERSION}/CentOS_7/"; \</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "gpgcheck=1"; \</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "gpgkey=${MIRROR_HTTPS}/${OSMOCOM_REPO_PATH}/${OSMOCOM_REPO_VERSION}/CentOS_7/repodata/repomd.xml.key"; \</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "enabled=1"; \</span><br><span style="color: hsl(120, 100%, 40%);">+ } > "/etc/yum.repos.d/network:osmocom:${OSMOCOM_REPO_VERSION}.repo"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+RUN dnf install -y \</span><br><span style="color: hsl(120, 100%, 40%);">+ telnet</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Make respawn.sh part of this image, so it can be used by other images based on it</span><br><span style="color: hsl(120, 100%, 40%);">+COPY .common/respawn.sh /usr/local/bin/respawn.sh</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Invalidate cache once the repository is updated</span><br><span style="color: hsl(120, 100%, 40%);">+ADD ${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/${OSMOCOM_REPO_VERSION}/CentOS_7/repodata/repomd.xml /tmp/repomd.xml</span><br><span>diff --git a/centos7-obs-latest/Makefile b/centos7-obs-latest/Makefile</span><br><span>new file mode 100644</span><br><span>index 0000000..cba5cee</span><br><span>--- /dev/null</span><br><span>+++ b/centos7-obs-latest/Makefile</span><br><span>@@ -0,0 +1,3 @@</span><br><span style="color: hsl(120, 100%, 40%);">+UPSTREAM_DISTRO:=centos:centos8</span><br><span style="color: hsl(120, 100%, 40%);">+DISTRO:=centos8</span><br><span style="color: hsl(120, 100%, 40%);">+include ../make/Makefile</span><br><span>diff --git a/jenkins-common.sh b/jenkins-common.sh</span><br><span>index 3511c02..9373076 100644</span><br><span>--- a/jenkins-common.sh</span><br><span>+++ b/jenkins-common.sh</span><br><span>@@ -15,7 +15,9 @@</span><br><span> feed="$(echo "$feed" | sed 's/\-centos8$//')" # e.g. "2021q1"</span><br><span> echo "centos8-obs-$feed"</span><br><span> ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-*-latest-centos7) echo "centos7-obs-latest" ;;</span><br><span> osmo-*-latest-centos8) echo "centos8-obs-latest" ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-*-centos7) echo "centos7-build" ;;</span><br><span> osmo-*-centos8) echo "centos8-build" ;;</span><br><span> osmo-*-latest) echo "debian-stretch-obs-latest" ;;</span><br><span> osmo-*) echo "debian-stretch-build" ;;</span><br><span>@@ -25,7 +27,9 @@</span><br><span> </span><br><span> docker_distro_from_image_name() {</span><br><span> case "$1" in</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-*-centos7) echo "centos7" ;;</span><br><span> osmo-*-centos8) echo "centos8" ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ centos7-*) echo "centos7" ;;</span><br><span> centos8-*) echo "centos8" ;;</span><br><span> *) echo "debian-stretch" ;;</span><br><span> esac</span><br><span>@@ -33,7 +37,9 @@</span><br><span> </span><br><span> docker_upstream_distro_from_image_name() {</span><br><span> case "$1" in</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-*-centos7) echo "centos:centos7"; ;;</span><br><span> osmo-*-centos8) echo "centos:centos8"; ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ centos7-*) echo "centos:centos7" ;;</span><br><span> centos8-*) echo "centos:centos8" ;;</span><br><span> debian10-*) echo "debian:buster" ;;</span><br><span> *) echo "debian:stretch" ;;</span><br><span>@@ -46,6 +52,10 @@</span><br><span> # e.g. osmo-mgw-2021q1-centos8 -> osmo-mgw-latest</span><br><span> echo "$1" | sed 's/20[0-9][0-9]q.*\-centos8$/latest/'</span><br><span> ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-*-centos7)</span><br><span style="color: hsl(120, 100%, 40%);">+ # e.g. osmo-mgw-latest-centos7 -> osmo-mgw-latest</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "$1" | sed 's/\-centos7$//'</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span> osmo-*-centos8)</span><br><span> # e.g. osmo-mgw-latest-centos8 -> osmo-mgw-latest</span><br><span> echo "$1" | sed 's/\-centos8$//'</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/26497">change 26497</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/docker-playground/+/26497"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: docker-playground </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Iadf3d0d7143c2d81ea5e87fd07a3f4cd9239cb46 </div>
<div style="display:none"> Gerrit-Change-Number: 26497 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>