From a42590bc0662126b77907f65527ef1564cf4f437 Mon Sep 17 00:00:00 2001 From: jbtrystram Date: Mon, 7 Oct 2024 17:39:49 +0200 Subject: [PATCH] Revert " DNM: update Dockerfile from changes in https://github.com/openshift/os/pull/1498" This reverts commit 57f7494b231c12fcea341b76870328ef7dfe7741. --- extensions/Dockerfile | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/extensions/Dockerfile b/extensions/Dockerfile index 9713ef3d..d2e0b540 100644 --- a/extensions/Dockerfile +++ b/extensions/Dockerfile @@ -9,28 +9,16 @@ ADD . . ARG COSA ARG VARIANT RUN if [[ -z "$COSA" ]] ; then ci/get-ocp-repo.sh ; fi -# On SCOS, we need to add the GPG keys of the various SIGs we need -RUN if rpm -q centos-stream-release; then \ - if [[ $(rpm -q --qf "%{VERSION}" centos-stream-release) == "9.0" ]]; then \ - if ! rpm -q centos-release-cloud; then \ - dnf install -y centos-release-{cloud,nfv,virt}-common; \ - fi && \ - mkdir -p /usr/share/distribution-gpg-keys/centos && \ - ln -s /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial /usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official && \ - ln -s {/etc/pki/rpm-gpg,/usr/share/distribution-gpg-keys/centos}/RPM-GPG-KEY-CentOS-SIG-Cloud && \ - ln -s {/etc/pki/rpm-gpg,/usr/share/distribution-gpg-keys/centos}/RPM-GPG-KEY-CentOS-SIG-Extras-SHA512 && \ - ln -s {/etc/pki/rpm-gpg,/usr/share/distribution-gpg-keys/centos}/RPM-GPG-KEY-CentOS-SIG-NFV && \ - ln -s {/etc/pki/rpm-gpg,/usr/share/distribution-gpg-keys/centos}/RPM-GPG-KEY-CentOS-SIG-Virtualization ; \ - fi ; \ - fi -RUN if [[ -n "${VARIANT}" ]]; then \ - MANIFEST="manifest-${VARIANT}.yaml"; \ - EXTENSIONS="extensions-${VARIANT}.yaml"; \ - else \ - MANIFEST="manifest.yaml"; \ - EXTENSIONS="extensions.yaml"; \ - fi && \ - rpm-ostree compose extensions --rootfs=/ --output-dir=/usr/share/rpm-ostree/extensions/ ./"${MANIFEST}" ./"${EXTENSIONS}" +# on SCOS, we need to add the GPG keys of the various SIGs we need +RUN if rpm -q centos-stream-release && ! rpm -q centos-release-cloud; then dnf install -y centos-release-{cloud,nfv,virt}-common; fi +RUN mkdir -p /usr/share/distribution-gpg-keys/centos +RUN ln -s /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial /usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official +RUN ln -s {/etc/pki/rpm-gpg,/usr/share/distribution-gpg-keys/centos}/RPM-GPG-KEY-CentOS-SIG-Cloud +RUN ln -s {/etc/pki/rpm-gpg,/usr/share/distribution-gpg-keys/centos}/RPM-GPG-KEY-CentOS-SIG-Extras-SHA512 +RUN ln -s {/etc/pki/rpm-gpg,/usr/share/distribution-gpg-keys/centos}/RPM-GPG-KEY-CentOS-SIG-NFV +RUN ln -s {/etc/pki/rpm-gpg,/usr/share/distribution-gpg-keys/centos}/RPM-GPG-KEY-CentOS-SIG-Virtualization +RUN if [[ -n "${VARIANT}" ]]; then MANIFEST="manifest-${VARIANT}.yaml"; EXTENSIONS="extensions-${VARIANT}.yaml"; else MANIFEST="manifest.yaml"; EXTENSIONS="extensions.yaml"; fi && rpm-ostree compose extensions --rootfs=/ --output-dir=/usr/share/rpm-ostree/extensions/ ./"${MANIFEST}" ./"${EXTENSIONS}" + ## Creates the repo metadata for the extensions. ## This uses Fedora as a lowest-common-denominator because it will work on ## current p8/s390x. See https://github.com/openshift/os/issues/1000