diff --git a/images/os/Dockerfile b/images/os/Dockerfile index ba13a65b6ac7..b3601ddd625a 100644 --- a/images/os/Dockerfile +++ b/images/os/Dockerfile @@ -1,7 +1,12 @@ FROM fedora:29 AS build COPY --from=registry.svc.ci.openshift.org/openshift/origin-v4.0:machine-os-content /srv/ /srv/ -RUN set -x && yum install -y ostree yum-utils selinux-policy-targeted && \ +# Don't use mirrors to avoid errors in build +COPY repos/* /etc/yum.repos.d/ +RUN set -x && \ + dnf clean all && \ + rm -rf /var/cache/dnf/* && \ + dnf install -y ostree yum-utils selinux-policy-targeted && \ commit=$( find /srv -name *.commit | sed -Ee 's|.*objects/(.+)/(.+)\.commit|\1\2|' | head -1 ) && \ mkdir /tmp/working && cd /tmp/working && \ yumdownloader --enablerepo=built --destdir=/tmp/rpms openshift-hyperkube openshift-clients && \ diff --git a/images/os/repos/fedora-modular.repo b/images/os/repos/fedora-modular.repo new file mode 100644 index 000000000000..e4c8e20fcdfc --- /dev/null +++ b/images/os/repos/fedora-modular.repo @@ -0,0 +1,11 @@ +[fedora-modular] +name=Fedora Modular $releasever - $basearch +failovermethod=priority +baseurl=https://download-ib01.fedoraproject.org/pub/fedora/linux/releases/$releasever/Modular/$basearch/os/ +enabled=1 +#metadata_expire=7d +repo_gpgcheck=0 +type=rpm +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch +skip_if_unavailable=False diff --git a/images/os/repos/fedora-updates-modular.repo b/images/os/repos/fedora-updates-modular.repo new file mode 100644 index 000000000000..e7a9e6ff6803 --- /dev/null +++ b/images/os/repos/fedora-updates-modular.repo @@ -0,0 +1,11 @@ +[updates-modular] +name=Fedora Modular $releasever - $basearch - Updates +failovermethod=priority +baseurl=https://download-ib01.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/$basearch/ +enabled=1 +repo_gpgcheck=0 +type=rpm +gpgcheck=1 +metadata_expire=6h +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch +skip_if_unavailable=False diff --git a/images/os/repos/fedora-updates.repo b/images/os/repos/fedora-updates.repo new file mode 100644 index 000000000000..65addfb827e6 --- /dev/null +++ b/images/os/repos/fedora-updates.repo @@ -0,0 +1,11 @@ +[updates] +name=Fedora $releasever - $basearch - Updates +failovermethod=priority +baseurl=https://download-ib01.fedoraproject.org/pub/fedora/linux/updates/$releasever/Everything/$basearch/ +enabled=1 +repo_gpgcheck=0 +type=rpm +gpgcheck=1 +metadata_expire=6h +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch +skip_if_unavailable=False diff --git a/images/os/repos/fedora.repo b/images/os/repos/fedora.repo new file mode 100644 index 000000000000..f23f2d121e59 --- /dev/null +++ b/images/os/repos/fedora.repo @@ -0,0 +1,11 @@ +[fedora] +name=Fedora $releasever - $basearch +failovermethod=priority +baseurl=https://download-ib01.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/ +enabled=1 +metadata_expire=7d +repo_gpgcheck=0 +type=rpm +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch +skip_if_unavailable=False