Change in docker-playground[master]: centos8: don't download .repo file

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

osmith gerrit-no-reply at lists.osmocom.org
Tue May 4 10:03:31 UTC 2021 

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/24113 )

Change subject: centos8: don't download .repo file
......................................................................

centos8: don't download .repo file

Generate the .repo file on the fly instead of downloading it from the
OBS repository. Ensure the gpgkey gets downloaded via HTTPS. I'm about
to use centos8-obs-latest with an alternative repository, which does not
have the .repo file. Adjust other containers for consistency.

Related: SYS#5370
Related: https://download.opensuse.org/repositories/network:/osmocom:/latest/CentOS_8/network:osmocom:latest.repo
Related: https://download.opensuse.org/repositories/network:/osmocom:/nightly/CentOS_8/network:osmocom:nightly.repo
Change-Id: Ic9ffa79cfe5a74bdc59d5ddd505a9af7be574bf9
---
M centos8-build/Dockerfile
M centos8-obs-latest/Dockerfile
M osmo-ran/Dockerfile
M osmo-ran/split/ran-bsc_mgw/Dockerfile
M osmo-ran/split/ran-bts_pcu/Dockerfile
M osmo-ran/split/ran-trx-ipc/Dockerfile
M osmo-ran/split/ran-trx-uhd/Dockerfile
7 files changed, 63 insertions(+), 9 deletions(-)

Approvals:
  pespin: Looks good to me, but someone else must approve
  daniel: Looks good to me, approved
  osmith: Verified



diff --git a/centos8-build/Dockerfile b/centos8-build/Dockerfile
index 68920e0..0e8b5f5 100644
--- a/centos8-build/Dockerfile
+++ b/centos8-build/Dockerfile
@@ -10,8 +10,15 @@
 # Make additional development libraries available from PowerTools and Osmocom nightly (e.g. libdbi)
 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:nightly/CentOS_8/network:osmocom:nightly.repo
+	export MIRROR_HTTPS="$(echo $OSMOCOM_REPO_MIRROR | sed s/^http:/https:/)" && \
+	{ echo "[network_osmocom_nightly]"; \
+	  echo "name=Nightly packages of the Osmocom project (CentOS_8)"; \
+	  echo "type=rpm-md"; \
+	  echo "baseurl=${OSMOCOM_REPO_MIRROR}/repositories/network:/osmocom:/nightly/CentOS_8/"; \
+	  echo "gpgcheck=1"; \
+	  echo "gpgkey=${MIRROR_HTTPS}/repositories/network:/osmocom:/nightly/CentOS_8/repodata/repomd.xml.key"; \
+	  echo "enabled=1"; \
+	} > /etc/yum.repos.d/network:osmocom:nightly.repo
 
 RUN	dnf install -y \
 		autoconf \
diff --git a/centos8-obs-latest/Dockerfile b/centos8-obs-latest/Dockerfile
index a9dfc9b..6e4f27e 100644
--- a/centos8-obs-latest/Dockerfile
+++ b/centos8-obs-latest/Dockerfile
@@ -11,8 +11,15 @@
 # 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
+	export MIRROR_HTTPS="$(echo $OSMOCOM_REPO_MIRROR | sed s/^http:/https:/)" && \
+	{ echo "[network_osmocom_latest]"; \
+	  echo "name=Latest tagged versions of osmocom cellular network elements (CentOS_8)"; \
+	  echo "type=rpm-md"; \
+	  echo "baseurl=${OSMOCOM_REPO_MIRROR}/repositories/network:/osmocom:/latest/CentOS_8/"; \
+	  echo "gpgcheck=1"; \
+	  echo "gpgkey=${MIRROR_HTTPS}/repositories/network:/osmocom:/latest/CentOS_8/repodata/repomd.xml.key"; \
+	  echo "enabled=1"; \
+	} > /etc/yum.repos.d/network:osmocom:latest.repo
 
 RUN	dnf install -y \
 		telnet
diff --git a/osmo-ran/Dockerfile b/osmo-ran/Dockerfile
index 3a5dac9..5b28b44 100644
--- a/osmo-ran/Dockerfile
+++ b/osmo-ran/Dockerfile
@@ -26,7 +26,15 @@
 		dnf install -y dnf-utils wget && \
 		yum config-manager --set-enabled PowerTools && \
 		cd /etc/yum.repos.d/ && \
-		wget ${OSMOCOM_REPO_CENTOS}/network:osmocom:$OSMOCOM_REPO_VERSION.repo \
+		export MIRROR_HTTPS="$(echo $OSMOCOM_REPO_CENTOS | sed s/^http:/https:/)" && \
+		{ echo "[network_osmocom_${OSMOCOM_REPO_VERSION}]"; \
+		  echo "name=Osmocom ${OSMOCOM_REPO_VERSION}"; \
+		  echo "type=rpm-md"; \
+		  echo "baseurl=${OSMOCOM_REPO_CENTOS}"; \
+		  echo "gpgcheck=1"; \
+		  echo "gpgkey=${MIRROR_HTTPS}repodata/repomd.xml.key"; \
+		  echo "enabled=1"; \
+		} > "/etc/yum.repos.d/network:osmocom:${OSMOCOM_REPO_VERSION}.repo" \
 		;; \
 	esac
 
diff --git a/osmo-ran/split/ran-bsc_mgw/Dockerfile b/osmo-ran/split/ran-bsc_mgw/Dockerfile
index b433d72..eec69ec 100644
--- a/osmo-ran/split/ran-bsc_mgw/Dockerfile
+++ b/osmo-ran/split/ran-bsc_mgw/Dockerfile
@@ -26,7 +26,15 @@
 		dnf install -y dnf-utils wget && \
 		yum config-manager --set-enabled PowerTools && \
 		cd /etc/yum.repos.d/ && \
-		wget ${OSMOCOM_REPO_CENTOS}/network:osmocom:$OSMOCOM_REPO_VERSION.repo \
+		export MIRROR_HTTPS="$(echo $OSMOCOM_REPO_CENTOS | sed s/^http:/https:/)" && \
+		{ echo "[network_osmocom_${OSMOCOM_REPO_VERSION}]"; \
+		  echo "name=Osmocom ${OSMOCOM_REPO_VERSION}"; \
+		  echo "type=rpm-md"; \
+		  echo "baseurl=${OSMOCOM_REPO_CENTOS}"; \
+		  echo "gpgcheck=1"; \
+		  echo "gpgkey=${MIRROR_HTTPS}repodata/repomd.xml.key"; \
+		  echo "enabled=1"; \
+		} > "/etc/yum.repos.d/network:osmocom:${OSMOCOM_REPO_VERSION}.repo" \
 		;; \
 	esac
 
diff --git a/osmo-ran/split/ran-bts_pcu/Dockerfile b/osmo-ran/split/ran-bts_pcu/Dockerfile
index f30e3d2..c3a1219 100644
--- a/osmo-ran/split/ran-bts_pcu/Dockerfile
+++ b/osmo-ran/split/ran-bts_pcu/Dockerfile
@@ -26,7 +26,15 @@
 		dnf install -y dnf-utils wget && \
 		yum config-manager --set-enabled PowerTools && \
 		cd /etc/yum.repos.d/ && \
-		wget ${OSMOCOM_REPO_CENTOS}/network:osmocom:$OSMOCOM_REPO_VERSION.repo \
+		export MIRROR_HTTPS="$(echo $OSMOCOM_REPO_CENTOS | sed s/^http:/https:/)" && \
+		{ echo "[network_osmocom_${OSMOCOM_REPO_VERSION}]"; \
+		  echo "name=Osmocom ${OSMOCOM_REPO_VERSION}"; \
+		  echo "type=rpm-md"; \
+		  echo "baseurl=${OSMOCOM_REPO_CENTOS}"; \
+		  echo "gpgcheck=1"; \
+		  echo "gpgkey=${MIRROR_HTTPS}repodata/repomd.xml.key"; \
+		  echo "enabled=1"; \
+		} > "/etc/yum.repos.d/network:osmocom:${OSMOCOM_REPO_VERSION}.repo" \
 		;; \
 	esac
 
diff --git a/osmo-ran/split/ran-trx-ipc/Dockerfile b/osmo-ran/split/ran-trx-ipc/Dockerfile
index 0720ccc..b3677b4 100644
--- a/osmo-ran/split/ran-trx-ipc/Dockerfile
+++ b/osmo-ran/split/ran-trx-ipc/Dockerfile
@@ -26,7 +26,15 @@
 		dnf install -y dnf-utils wget && \
 		yum config-manager --set-enabled PowerTools && \
 		cd /etc/yum.repos.d/ && \
-		wget ${OSMOCOM_REPO_CENTOS}/network:osmocom:$OSMOCOM_REPO_VERSION.repo \
+		export MIRROR_HTTPS="$(echo $OSMOCOM_REPO_CENTOS | sed s/^http:/https:/)" && \
+		{ echo "[network_osmocom_${OSMOCOM_REPO_VERSION}]"; \
+		  echo "name=Osmocom ${OSMOCOM_REPO_VERSION}"; \
+		  echo "type=rpm-md"; \
+		  echo "baseurl=${OSMOCOM_REPO_CENTOS}"; \
+		  echo "gpgcheck=1"; \
+		  echo "gpgkey=${MIRROR_HTTPS}repodata/repomd.xml.key"; \
+		  echo "enabled=1"; \
+		} > "/etc/yum.repos.d/network:osmocom:${OSMOCOM_REPO_VERSION}.repo" \
 		;; \
 	esac
 
diff --git a/osmo-ran/split/ran-trx-uhd/Dockerfile b/osmo-ran/split/ran-trx-uhd/Dockerfile
index 5431210..9279112 100644
--- a/osmo-ran/split/ran-trx-uhd/Dockerfile
+++ b/osmo-ran/split/ran-trx-uhd/Dockerfile
@@ -26,7 +26,15 @@
 		dnf install -y dnf-utils wget && \
 		yum config-manager --set-enabled PowerTools && \
 		cd /etc/yum.repos.d/ && \
-		wget ${OSMOCOM_REPO_CENTOS}/network:osmocom:$OSMOCOM_REPO_VERSION.repo \
+		export MIRROR_HTTPS="$(echo $OSMOCOM_REPO_CENTOS | sed s/^http:/https:/)" && \
+		{ echo "[network_osmocom_${OSMOCOM_REPO_VERSION}]"; \
+		  echo "name=Osmocom ${OSMOCOM_REPO_VERSION}"; \
+		  echo "type=rpm-md"; \
+		  echo "baseurl=${OSMOCOM_REPO_CENTOS}"; \
+		  echo "gpgcheck=1"; \
+		  echo "gpgkey=${MIRROR_HTTPS}repodata/repomd.xml.key"; \
+		  echo "enabled=1"; \
+		} > "/etc/yum.repos.d/network:osmocom:${OSMOCOM_REPO_VERSION}.repo" \
 		;; \
 	esac
 

-- 
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/24113
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Ic9ffa79cfe5a74bdc59d5ddd505a9af7be574bf9
Gerrit-Change-Number: 24113
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: daniel <dwillmann at sysmocom.de>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210504/3df1d8fd/attachment.htm>

More information about the gerrit-log mailing list