diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2021-04-30 15:02:04 +0200 |
|---|---|---|
| committer | Oliver Smith <osmith@sysmocom.de> | 2021-05-04 09:30:48 +0200 |
| commit | 84255c7bb860a165878308507443ddf09c0443df (patch) | |
| tree | 45de622da5dfb8e0c55f4c9eb84ed65d6b0579a4 /osmo-ran | |
| parent | ce8da526b0fffb06d2c465ed4f4605b44de6831d (diff) | |
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
Diffstat (limited to 'osmo-ran')
| -rw-r--r-- | osmo-ran/Dockerfile | 10 | ||||
| -rw-r--r-- | osmo-ran/split/ran-bsc_mgw/Dockerfile | 10 | ||||
| -rw-r--r-- | osmo-ran/split/ran-bts_pcu/Dockerfile | 10 | ||||
| -rw-r--r-- | osmo-ran/split/ran-trx-ipc/Dockerfile | 10 | ||||
| -rw-r--r-- | osmo-ran/split/ran-trx-uhd/Dockerfile | 10 |
5 files changed, 45 insertions, 5 deletions
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 @@ RUN case "$DISTRO" in \ 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 @@ RUN case "$DISTRO" in \ 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 @@ RUN case "$DISTRO" in \ 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 @@ RUN case "$DISTRO" in \ 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 @@ RUN case "$DISTRO" in \ 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 |