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

images: Adjust centos-9-bootc for cockpit testing #7365

Merged
merged 4 commits into from
Jan 30, 2025
Merged

images: Adjust centos-9-bootc for cockpit testing #7365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
263fce1
images: Set bootc image admin GECOS field
martinpitt Jan 29, 2025
f5903a4
images: Update bootc image
martinpitt Jan 29, 2025
1a3bf2e
images: Add some Cockpit runtime and test deps to centos-9-bootc
martinpitt Jan 28, 2025
a434ce4
images: Update centos-9-bootc image
Jan 29, 2025
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
2 changes: 1 addition & 1 deletion images/centos-9-bootc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
centos-9-bootc-8a227fece37b2710436d8e8345cc7bf858d8499841efc5aa6d6927cd5793857b.qcow2
centos-9-bootc-ece5b06636c366554dab7e869a011246c8f34b9b46eedbe2a5f7f20b7bbe9e69.qcow2
3 changes: 3 additions & 0 deletions images/scripts/bootc.setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ set -eux

IMAGE="$1"

# config.json cannot set GECOS
usermod -c Administrator admin

podman pull quay.io/cockpit/ws
podman pull quay.io/jitesoft/nginx

Expand Down
3 changes: 3 additions & 0 deletions images/scripts/lib/bootc.Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@ ARG base_image
FROM $base_image

# pre-install the distro version, which is useful for testing extensions and manual experiments
# also pre-install ws and test dependencies
RUN \
dnf update -y --exclude='kernel*' && \
Copy link
Member

Choose a reason for hiding this comment

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

Is that a known issue, sounds like it could use a # HACK unless we never want to support it?

Copy link
Member Author

Choose a reason for hiding this comment

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

It's at least not necessary for us to support. I had to add it because the original container has a too old selinux-policy -- the rpm build in the mock of centos-9-stream depended on a newer version. I haven't reported the kernel failure yet, but added to my TODO list.

dnf install -y --setopt install_weak_deps=False cockpit-system cockpit-networkmanager && \
dnf install -y dnsmasq pcp python3-pcp rsync sscg strace system-logos wireguard-tools && \
dnf clean all

ADD lib/mcast1.nmconnection /usr/lib/NetworkManager/system-connections/
Expand Down
Loading