From e66f8f463c175c5b10855e112a12360253f7bf08 Mon Sep 17 00:00:00 2001 From: sys_osgc Date: Wed, 5 May 2021 23:37:52 +0000 Subject: [PATCH] updating for rhel 8.3 --- scripts/build-dockerfile.sh | 8 ++ templates/rhel/18-create-user.in | 2 +- templates/rhel/8.3/10-rhel-partner.in | 170 ++++++++++++++++++++++++++ 3 files changed, 179 insertions(+), 1 deletion(-) create mode 100644 templates/rhel/8.3/10-rhel-partner.in diff --git a/scripts/build-dockerfile.sh b/scripts/build-dockerfile.sh index bd277a1..cb4a559 100755 --- a/scripts/build-dockerfile.sh +++ b/scripts/build-dockerfile.sh @@ -133,6 +133,14 @@ for snippet in ${SNIPPETS[@]}; do continue fi fi + + # If NO_REPO is set, then use neither repository + if (( NO_REPO )); then + if [[ ${snippet} =~ ..-local-file-intel-repo.in ]] || + [[ ${snippet} =~ ..-repositories-intel-com.in ]]; then + continue + fi + fi TMP+=(${snippet}) done SNIPPETS=(${TMP[@]}) diff --git a/templates/rhel/18-create-user.in b/templates/rhel/18-create-user.in index 64c5a0f..1db8ee3 100644 --- a/templates/rhel/18-create-user.in +++ b/templates/rhel/18-create-user.in @@ -3,7 +3,7 @@ FROM xe-base-stage AS xe-user-stage -RUN dnf install -y sudo +RUN dnf install -y sudo openssl # NOTE: Requires 'sudo' package to already be installed RUN groupadd -r user \ diff --git a/templates/rhel/8.3/10-rhel-partner.in b/templates/rhel/8.3/10-rhel-partner.in new file mode 100644 index 0000000..3847c79 --- /dev/null +++ b/templates/rhel/8.3/10-rhel-partner.in @@ -0,0 +1,170 @@ +# Remove any pre-configured repositories +RUN rm -rf /etc/yum.repos.d/* + +# Partner keys from: +# https://gitlab.devtools.intel.com/vtt/sws/gfx-build-docker-images +RUN { \ + echo '#[RHEL-8-baseos-intel-OSTC]' ; \ + echo '#baseurl=https://linux-ftp.ostc.intel.com/pub/ISO/redhat/redhat-rhel/RHEL-8.0.0-GA/BaseOS/x86_64/os/' ; \ + echo '#enabled=1' ; \ + echo '#sslverify=0' ; \ + echo '#skip_if_unavailable=1' ; \ + echo '' ; \ +} > /etc/yum.repos.d/intel-ostc-example.repo +RUN { \ + echo '[RHEL-8-appstream-partners]' ; \ + echo 'name=Red Hat Enterprise Linux 8.3.0 Partners (AppStream) - $basearch' ; \ + echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.3.0-RC-1.1/AppStream/$basearch/os' ; \ + echo 'enabled=1' ; \ + echo 'gpgcheck=1' ; \ + echo 'gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta' ; \ + echo 'skip_if_unavailable=1' ; \ + echo '' ; \ + echo '[RHEL-8-appstream-partners-debug]' ; \ + echo 'name=Red Hat Enterprise Linux 8.3.0 Partners (AppStream) - $basearch - Debug' ; \ + echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.3.0-RC-1.1/AppStream/$basearch/debug/tree' ; \ + echo 'enabled=0' ; \ + echo 'gpgcheck=1' ; \ + echo 'gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta' ; \ + echo 'skip_if_unavailable=1' ; \ + echo '' ; \ + echo '[RHEL-8-appstream-partners-source]' ; \ + echo 'name=Red Hat Enterprise Linux 8.3.0 Partners (AppStream) - Source' ; \ + echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.3.0-RC-1.1/AppStream/source/tree' ; \ + echo 'enabled=0' ; \ + echo 'gpgcheck=1' ; \ + echo 'gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta' ; \ + echo 'skip_if_unavailable=1' ; \ + echo '' ; \ +} > /etc/yum.repos.d/RHEL-8-appstream.repo +RUN { \ + echo '[RHEL-8-baseos-partners]' ; \ + echo 'name=Red Hat Enterprise Linux 8.3.0 Partners (BaseOS) - $basearch' ; \ + echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.3.0-RC-1.1/BaseOS/$basearch/os' ; \ + echo 'enabled=1' ; \ + echo 'gpgcheck=1' ; \ + echo 'gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta' ; \ + echo 'skip_if_unavailable=1' ; \ + echo '' ; \ + echo '[RHEL-8-baseos-partners-debug]' ; \ + echo 'name=Red Hat Enterprise Linux 8.3.0 Partners (BaseOS) - $basearch - Debug' ; \ + echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.3.0-RC-1.1/BaseOS/$basearch/debug/tree' ; \ + echo 'enabled=0' ; \ + echo 'gpgcheck=1' ; \ + echo 'gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta' ; \ + echo 'skip_if_unavailable=1' ; \ + echo '' ; \ + echo '[RHEL-8-baseos-partners-source]' ; \ + echo 'name=Red Hat Enterprise Linux 8.3.0 Partners (BaseOS) - Source' ; \ + echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.3.0-RC-1.1/BaseOS/source/tree' ; \ + echo 'enabled=0' ; \ + echo 'gpgcheck=1' ; \ + echo 'gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta' ; \ + echo 'skip_if_unavailable=1' ; \ + echo '' ; \ +} > /etc/yum.repos.d/RHEL-8-baseos.repo +RUN { \ + echo '[RHEL-8-crb-partners]' ; \ + echo 'name=Red Hat Enterprise Linux 8.3.0 Partners (CRB) - $basearch' ; \ + echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.3.0-RC-1.1/CRB/$basearch/os' ; \ + echo 'enabled=1' ; \ + echo 'gpgcheck=1' ; \ + echo 'gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta' ; \ + echo 'skip_if_unavailable=1' ; \ + echo '' ; \ + echo '[RHEL-8-crb-partners-debug]' ; \ + echo 'name=Red Hat Enterprise Linux 8.3.0 Partners (CRB) - $basearch - Debug' ; \ + echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.3.0-RC-1.1/CRB/$basearch/debug/tree' ; \ + echo 'enabled=0' ; \ + echo 'gpgcheck=1' ; \ + echo 'gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta' ; \ + echo 'skip_if_unavailable=1' ; \ + echo '' ; \ + echo '[RHEL-8-crb-partners-source]' ; \ + echo 'name=Red Hat Enterprise Linux 8.3.0 Partners (CRB) - Source' ; \ + echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.3.0-RC-1.1/CRB/source/tree' ; \ + echo 'enabled=0' ; \ + echo 'gpgcheck=1' ; \ + echo 'gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta' ; \ + echo 'skip_if_unavailable=1' ; \ + echo '' ; \ +} > /etc/yum.repos.d/RHEL-8-crb.repo +RUN { \ + echo '[RHEL-8-highavailability-partners]' ; \ + echo 'name=Red Hat Enterprise Linux 8.3.0 Partners (HighAvailability) - $basearch' ; \ + echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.3.0-RC-1.1/HighAvailability/$basearch/os' ; \ + echo 'enabled=1' ; \ + echo 'gpgcheck=1' ; \ + echo 'gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta' ; \ + echo 'skip_if_unavailable=1' ; \ + echo '' ; \ + echo '[RHEL-8-highavailability-partners-debug]' ; \ + echo 'name=Red Hat Enterprise Linux 8.3.0 Partners (HighAvailability) - $basearch - Debug' ; \ + echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.3.0-RC-1.1/HighAvailability/$basearch/debug/tree' ; \ + echo 'enabled=0' ; \ + echo 'gpgcheck=1' ; \ + echo 'gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta' ; \ + echo 'skip_if_unavailable=1' ; \ + echo '' ; \ + echo '[RHEL-8-highavailability-partners-source]' ; \ + echo 'name=Red Hat Enterprise Linux 8.3.0 Partners (HighAvailability) - Source' ; \ + echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.3.0-RC-1.1/HighAvailability/source/tree' ; \ + echo 'enabled=0' ; \ + echo 'gpgcheck=1' ; \ + echo 'gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta' ; \ + echo 'skip_if_unavailable=1' ; \ + echo '' ; \ + echo '' ; \ +} > /etc/yum.repos.d/RHEL-8-highavailability.repo +RUN { \ + echo '[RHEL-8-resilientstorage-partners]' ; \ + echo 'name=Red Hat Enterprise Linux 8.3.0 Partners (ResilientStorage) - $basearch' ; \ + echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.3.0-RC-1.1/ResilientStorage/$basearch/os' ; \ + echo 'enabled=1' ; \ + echo 'gpgcheck=1' ; \ + echo 'gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta' ; \ + echo 'skip_if_unavailable=1' ; \ + echo '' ; \ + echo '[RHEL-8-resilientstorage-partners-debug]' ; \ + echo 'name=Red Hat Enterprise Linux 8.3.0 Partners (ResilientStorage) - $basearch - Debug' ; \ + echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.3.0-RC-1.1/ResilientStorage/$basearch/debug/tree' ; \ + echo 'enabled=0' ; \ + echo 'gpgcheck=1' ; \ + echo 'gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta' ; \ + echo 'skip_if_unavailable=1' ; \ + echo '' ; \ + echo '[RHEL-8-resilientstorage-partners-source]' ; \ + echo 'name=Red Hat Enterprise Linux 8.3.0 Partners (ResilientStorage) - Source' ; \ + echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.3.0-RC-1.1/ResilientStorage/source/tree' ; \ + echo 'enabled=0' ; \ + echo 'gpgcheck=1' ; \ + echo 'gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta' ; \ + echo 'skip_if_unavailable=1' ; \ + echo '' ; \ +} > /etc/yum.repos.d/RHEL-8-resilientstorage.repo +RUN { \ + echo '[RHEL-8-rt-partners]' ; \ + echo 'name=Red Hat Enterprise Linux 8.3.0 Partners (RT) - $basearch' ; \ + echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.3.0-RC-1.1/RT/$basearch/os' ; \ + echo 'enabled=1' ; \ + echo 'gpgcheck=1' ; \ + echo 'gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta' ; \ + echo 'skip_if_unavailable=1' ; \ + echo '' ; \ + echo '[RHEL-8-rt-partners-debug]' ; \ + echo 'name=Red Hat Enterprise Linux 8.3.0 Partners (RT) - $basearch - Debug' ; \ + echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.3.0-RC-1.1/RT/$basearch/debug/tree' ; \ + echo 'enabled=0' ; \ + echo 'gpgcheck=1' ; \ + echo 'gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta' ; \ + echo 'skip_if_unavailable=1' ; \ + echo '' ; \ + echo '[RHEL-8-rt-partners-source]' ; \ + echo 'name=Red Hat Enterprise Linux 8.3.0 Partners (RT) - Source' ; \ + echo 'baseurl=ftp://partners.redhat.com/1c5d859a/91fe32f09e2de2cc3eb0f86526b4c7ca/RHEL-8.3.0-RC-1.1/RT/source/tree' ; \ + echo 'enabled=0' ; \ + echo 'gpgcheck=1' ; \ + echo 'gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta' ; \ + echo 'skip_if_unavailable=1' ; \ + echo '' ; \ +} > /etc/yum.repos.d/RHEL-8-rt.repo