Skip to content

OCPBUGS 59846 OCP image mode docs should use "bootc container lint" #96758

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

OCPBUGS 59846 OCP image mode docs should use "bootc container lint" #96758

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
14 changes: 7 additions & 7 deletions machine_configuration/mco-coreos-layering.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ content: |-
https://example.com/files/systemd-udev-252-46.el9_4.x86_64.rpm \
https://example.com/files/systemd-rpm-macros-252-46.el9_4.noarch.rpm && \
dnf clean all && \
ostree container commit
bootc container lint
----
+
.Example out-of-cluster Containerfile to apply a Hotfix
Expand All @@ -84,7 +84,7 @@ RUN dnf update -y https://example.com/files/systemd-252-46.el9_4.x86_64.rpm \
https://example.com/files/systemd-udev-252-46.el9_4.x86_64.rpm \
https://example.com/files/systemd-rpm-macros-252-46.el9_4.noarch.rpm && \
dnf clean all && \
ostree container commit
bootc container lint
----
// https://issues.redhat.com/browse/OCPBUGS-42838

Expand All @@ -97,7 +97,7 @@ RUN dnf update -y https://example.com/files/systemd-252-46.el9_4.x86_64.rpm \
FROM quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256...
# Install rsyslog package
RUN dnf install -y rsyslog && \
ostree container commit
bootc container lint
# Copy your custom configuration in
ADD remote.conf /etc/rsyslog.d/remote.conf
----
Expand All @@ -121,7 +121,7 @@ FROM configs AS final
RUN dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
dnf install -y htop && \
dnf clean all && \
ostree container commit
bootc container lint
----
+
.Example out-of-cluster Containerfile to apply a third-party package from EPEL
Expand All @@ -134,7 +134,7 @@ FROM quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256...
RUN dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
dnf install -y htop && \
dnf clean all && \
ostree container commit
bootc container lint
----
+
This Containerfile installs the {op-system-base} fish program. Because fish requires additional {op-system-base} packages, the image must be built on an entitled {op-system-base} host. For {op-system-base} entitlements to work, you must copy the `etc-pki-entitlement` secret into the `openshift-machine-config-operator` namespace.
Expand All @@ -148,7 +148,7 @@ FROM configs AS final
# Install fish as third party package from EPEL
RUN dnf install -y https://dl.fedoraproject.org/pub/epel/9/Everything/x86_64/Packages/f/fish-3.3.1-3.el9.x86_64.rpm && \
dnf clean all && \
ostree container commit
bootc container lint
----
+
.Example out-of-cluster Containerfile to apply a third-party package that has {op-system-base} dependencies
Expand All @@ -161,7 +161,7 @@ FROM quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256...
# Install fish as third party package from EPEL
RUN dnf install -y https://dl.fedoraproject.org/pub/epel/9/Everything/x86_64/Packages/f/fish-3.3.1-3.el9.x86_64.rpm && \
dnf clean all && \
ostree container commit
bootc container lint
----

After you create the machine config, the Machine Config Operator (MCO) performs the following steps:
Expand Down
4 changes: 2 additions & 2 deletions modules/coreos-layering-configuring-on-modifying.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ spec:
RUN rpm-ostree install rng-tools && \
systemctl enable rngd && \
rpm-ostree cleanup -m && \
ostree container commit
bootc container lint

RUN rpm-ostree install tree && \
ostree container commit
bootc container lint
imageBuilder:
imageBuilderType: PodImageBuilder
baseImagePullSecret:
Expand Down
2 changes: 1 addition & 1 deletion modules/coreos-layering-configuring-on-proc.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ spec:
FROM configs AS final
RUN dnf install -y cowsay && \
dnf clean all && \
ostree container commit
bootc container lint
imageBuilder: # <6>
imageBuilderType: Job
baseImagePullSecret: # <7>
Expand Down
2 changes: 1 addition & 1 deletion modules/coreos-layering-configuring.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ FROM quay.io/openshift-release/ocp-release@sha256... <1>
#Install hotfix rpm
RUN rpm-ostree override replace http://mirror.stream.centos.org/9-stream/BaseOS/x86_64/os/Packages/kernel-{,core-,modules-,modules-core-,modules-extra-}5.14.0-295.el9.x86_64.rpm && \ <2>
rpm-ostree cleanup -m && \
ostree container commit
bootc container lint
----
<1> Specifies the {op-system} base image of your cluster.
<2> Replaces the kernel packages.
Expand Down