Skip to content

os/Dockerfile: Use dnf, pin repos, and clean cache #23613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ashcrow wants to merge 1 commit into from
Closed

os/Dockerfile: Use dnf, pin repos, and clean cache #23613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion images/os/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 && \
Expand Down
11 changes: 11 additions & 0 deletions images/os/repos/fedora-modular.repo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
11 changes: 11 additions & 0 deletions images/os/repos/fedora-updates-modular.repo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
11 changes: 11 additions & 0 deletions images/os/repos/fedora-updates.repo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
11 changes: 11 additions & 0 deletions images/os/repos/fedora.repo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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