<p>osmith <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/24113">View Change</a></p><div style="white-space:pre-wrap">Approvals:
pespin: Looks good to me, but someone else must approve
daniel: Looks good to me, approved
osmith: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">centos8: don't download .repo file<br><br>Generate the .repo file on the fly instead of downloading it from the<br>OBS repository. Ensure the gpgkey gets downloaded via HTTPS. I'm about<br>to use centos8-obs-latest with an alternative repository, which does not<br>have the .repo file. Adjust other containers for consistency.<br><br>Related: SYS#5370<br>Related: https://download.opensuse.org/repositories/network:/osmocom:/latest/CentOS_8/network:osmocom:latest.repo<br>Related: https://download.opensuse.org/repositories/network:/osmocom:/nightly/CentOS_8/network:osmocom:nightly.repo<br>Change-Id: Ic9ffa79cfe5a74bdc59d5ddd505a9af7be574bf9<br>---<br>M centos8-build/Dockerfile<br>M centos8-obs-latest/Dockerfile<br>M osmo-ran/Dockerfile<br>M osmo-ran/split/ran-bsc_mgw/Dockerfile<br>M osmo-ran/split/ran-bts_pcu/Dockerfile<br>M osmo-ran/split/ran-trx-ipc/Dockerfile<br>M osmo-ran/split/ran-trx-uhd/Dockerfile<br>7 files changed, 63 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/centos8-build/Dockerfile b/centos8-build/Dockerfile</span><br><span>index 68920e0..0e8b5f5 100644</span><br><span>--- a/centos8-build/Dockerfile</span><br><span>+++ b/centos8-build/Dockerfile</span><br><span>@@ -10,8 +10,15 @@</span><br><span> # Make additional development libraries available from PowerTools and Osmocom nightly (e.g. libdbi)</span><br><span> RUN dnf install -y dnf-utils wget && \</span><br><span> yum config-manager --set-enabled powertools && \</span><br><span style="color: hsl(0, 100%, 40%);">- cd /etc/yum.repos.d/ && \</span><br><span style="color: hsl(0, 100%, 40%);">- wget $OSMOCOM_REPO_MIRROR/repositories/network:osmocom:nightly/CentOS_8/network:osmocom:nightly.repo</span><br><span style="color: hsl(120, 100%, 40%);">+ 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_8)"; \</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}/repositories/network:/osmocom:/nightly/CentOS_8/"; \</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}/repositories/network:/osmocom:/nightly/CentOS_8/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> </span><br><span> RUN dnf install -y \</span><br><span> autoconf \</span><br><span>diff --git a/centos8-obs-latest/Dockerfile b/centos8-obs-latest/Dockerfile</span><br><span>index a9dfc9b..6e4f27e 100644</span><br><span>--- a/centos8-obs-latest/Dockerfile</span><br><span>+++ b/centos8-obs-latest/Dockerfile</span><br><span>@@ -11,8 +11,15 @@</span><br><span> # Osmocom latest OBS repository</span><br><span> RUN dnf install -y dnf-utils wget && \</span><br><span> yum config-manager --set-enabled powertools && \</span><br><span style="color: hsl(0, 100%, 40%);">- cd /etc/yum.repos.d/ && \</span><br><span style="color: hsl(0, 100%, 40%);">- wget $OSMOCOM_REPO_MIRROR/repositories/network:osmocom:latest/CentOS_8/network:osmocom:latest.repo</span><br><span style="color: hsl(120, 100%, 40%);">+ export MIRROR_HTTPS="$(echo $OSMOCOM_REPO_MIRROR | sed s/^http:/https:/)" && \</span><br><span style="color: hsl(120, 100%, 40%);">+ { echo "[network_osmocom_latest]"; \</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "name=Latest tagged versions of osmocom cellular network elements (CentOS_8)"; \</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}/repositories/network:/osmocom:/latest/CentOS_8/"; \</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}/repositories/network:/osmocom:/latest/CentOS_8/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:latest.repo</span><br><span> </span><br><span> RUN dnf install -y \</span><br><span> telnet</span><br><span>diff --git a/osmo-ran/Dockerfile b/osmo-ran/Dockerfile</span><br><span>index 3a5dac9..5b28b44 100644</span><br><span>--- a/osmo-ran/Dockerfile</span><br><span>+++ b/osmo-ran/Dockerfile</span><br><span>@@ -26,7 +26,15 @@</span><br><span> dnf install -y dnf-utils wget && \</span><br><span> yum config-manager --set-enabled PowerTools && \</span><br><span> cd /etc/yum.repos.d/ && \</span><br><span style="color: hsl(0, 100%, 40%);">- wget ${OSMOCOM_REPO_CENTOS}/network:osmocom:$OSMOCOM_REPO_VERSION.repo \</span><br><span style="color: hsl(120, 100%, 40%);">+ export MIRROR_HTTPS="$(echo $OSMOCOM_REPO_CENTOS | 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_CENTOS}"; \</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}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> ;; \</span><br><span> esac</span><br><span> </span><br><span>diff --git a/osmo-ran/split/ran-bsc_mgw/Dockerfile b/osmo-ran/split/ran-bsc_mgw/Dockerfile</span><br><span>index b433d72..eec69ec 100644</span><br><span>--- a/osmo-ran/split/ran-bsc_mgw/Dockerfile</span><br><span>+++ b/osmo-ran/split/ran-bsc_mgw/Dockerfile</span><br><span>@@ -26,7 +26,15 @@</span><br><span> dnf install -y dnf-utils wget && \</span><br><span> yum config-manager --set-enabled PowerTools && \</span><br><span> cd /etc/yum.repos.d/ && \</span><br><span style="color: hsl(0, 100%, 40%);">- wget ${OSMOCOM_REPO_CENTOS}/network:osmocom:$OSMOCOM_REPO_VERSION.repo \</span><br><span style="color: hsl(120, 100%, 40%);">+ export MIRROR_HTTPS="$(echo $OSMOCOM_REPO_CENTOS | 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_CENTOS}"; \</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}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> ;; \</span><br><span> esac</span><br><span> </span><br><span>diff --git a/osmo-ran/split/ran-bts_pcu/Dockerfile b/osmo-ran/split/ran-bts_pcu/Dockerfile</span><br><span>index f30e3d2..c3a1219 100644</span><br><span>--- a/osmo-ran/split/ran-bts_pcu/Dockerfile</span><br><span>+++ b/osmo-ran/split/ran-bts_pcu/Dockerfile</span><br><span>@@ -26,7 +26,15 @@</span><br><span> dnf install -y dnf-utils wget && \</span><br><span> yum config-manager --set-enabled PowerTools && \</span><br><span> cd /etc/yum.repos.d/ && \</span><br><span style="color: hsl(0, 100%, 40%);">- wget ${OSMOCOM_REPO_CENTOS}/network:osmocom:$OSMOCOM_REPO_VERSION.repo \</span><br><span style="color: hsl(120, 100%, 40%);">+ export MIRROR_HTTPS="$(echo $OSMOCOM_REPO_CENTOS | 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_CENTOS}"; \</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}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> ;; \</span><br><span> esac</span><br><span> </span><br><span>diff --git a/osmo-ran/split/ran-trx-ipc/Dockerfile b/osmo-ran/split/ran-trx-ipc/Dockerfile</span><br><span>index 0720ccc..b3677b4 100644</span><br><span>--- a/osmo-ran/split/ran-trx-ipc/Dockerfile</span><br><span>+++ b/osmo-ran/split/ran-trx-ipc/Dockerfile</span><br><span>@@ -26,7 +26,15 @@</span><br><span> dnf install -y dnf-utils wget && \</span><br><span> yum config-manager --set-enabled PowerTools && \</span><br><span> cd /etc/yum.repos.d/ && \</span><br><span style="color: hsl(0, 100%, 40%);">- wget ${OSMOCOM_REPO_CENTOS}/network:osmocom:$OSMOCOM_REPO_VERSION.repo \</span><br><span style="color: hsl(120, 100%, 40%);">+ export MIRROR_HTTPS="$(echo $OSMOCOM_REPO_CENTOS | 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_CENTOS}"; \</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}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> ;; \</span><br><span> esac</span><br><span> </span><br><span>diff --git a/osmo-ran/split/ran-trx-uhd/Dockerfile b/osmo-ran/split/ran-trx-uhd/Dockerfile</span><br><span>index 5431210..9279112 100644</span><br><span>--- a/osmo-ran/split/ran-trx-uhd/Dockerfile</span><br><span>+++ b/osmo-ran/split/ran-trx-uhd/Dockerfile</span><br><span>@@ -26,7 +26,15 @@</span><br><span> dnf install -y dnf-utils wget && \</span><br><span> yum config-manager --set-enabled PowerTools && \</span><br><span> cd /etc/yum.repos.d/ && \</span><br><span style="color: hsl(0, 100%, 40%);">- wget ${OSMOCOM_REPO_CENTOS}/network:osmocom:$OSMOCOM_REPO_VERSION.repo \</span><br><span style="color: hsl(120, 100%, 40%);">+ export MIRROR_HTTPS="$(echo $OSMOCOM_REPO_CENTOS | 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_CENTOS}"; \</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}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> ;; \</span><br><span> esac</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/24113">change 24113</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/+/24113"/><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: Ic9ffa79cfe5a74bdc59d5ddd505a9af7be574bf9 </div>
<div style="display:none"> Gerrit-Change-Number: 24113 </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-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>