Skip to content
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

Jump to bottom

[release-4.12] Revert "DEBUG: don't pull in fresh FCOS" #532

Merged
merged 2 commits into from
Mar 2, 2023
Merged

[release-4.12] Revert "DEBUG: don't pull in fresh FCOS" #532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cc1a31
Revert "DEBUG: don't pull in fresh FCOS"
vrutkovs Feb 20, 2023
e9553d8
Pin crio to 1.25.1
vrutkovs Mar 2, 2023
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
40 changes: 21 additions & 19 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,32 @@
FROM registry.ci.openshift.org/origin/4.12:artifacts as artifacts

FROM registry.ci.openshift.org/origin/4.12:machine-os-content
FROM quay.io/fedora/fedora-coreos:stable
ARG FEDORA_COREOS_VERSION=412.37.0

WORKDIR /go/src/github.com/openshift/okd-machine-os
COPY . .
COPY --from=artifacts /srv/repo/ /tmp/rpms/
RUN cat /etc/os-release \
&& rpm-ostree --version \
&& ostree --version \
&& cp -irvf overlay.d/*/* / \
&& cp -irvf bootstrap / \
&& cp -irvf manifests / \
&& cp -ivf crio.repo /etc/yum.repos.d/ \
&& rpm-ostree install \
NetworkManager-ovs \
open-vm-tools \
qemu-guest-agent \
cri-o \
cri-tools \
netcat \
#&& rpm-ostree override replace /tmp/rpms/openshift-hyperkube-*.rpm \
&& rpm-ostree cleanup -m \
&& rm -rf /go /tmp/rpms /var/cache /var/lib/unbound \
&& systemctl preset-all \
&& ostree container commit
&& rpm-ostree --version \
&& ostree --version \
&& cp -irvf overlay.d/*/* / \
&& cp -irvf bootstrap / \
&& cp -irvf manifests / \
&& cp -ivf crio.repo /etc/yum.repos.d/ \
&& rpm-ostree install \
NetworkManager-ovs \
open-vm-tools \
qemu-guest-agent \
cri-o \
cri-tools \
netcat \
/tmp/rpms/openshift-clients-[0-9]*.rpm \
/tmp/rpms/openshift-hyperkube-*.rpm \
&& rpm-ostree cleanup -m \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rpm-ostree cleanup -m isn't required anymore (ref coreos/layering-examples@38ef86c)

&& ln -s /usr/sbin/ovs-vswitchd.dpdk /usr/sbin/ovs-vswitchd \
&& rm -rf /go /tmp/rpms /var/cache /var/lib/unbound \
&& systemctl preset-all \
&& ostree container commit

LABEL io.openshift.release.operator=true \
io.openshift.build.version-display-names="machine-os=Fedora CoreOS" \
Expand Down
2 changes: 1 addition & 1 deletion crio.repo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[cri-o_1.25]
name=devel:kubic:libcontainers:stable:cri-o:1.25 (Fedora_37)
type=rpm-md
baseurl=https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/1.25/Fedora_37/
baseurl=https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/1.25:/1.25.1/Fedora_36/
gpgcheck=1
gpgkey=https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/1.25/Fedora_37/repodata/repomd.xml.key
enabled=1
Expand Down