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

add tools to be able improve ISO for rhel4edge #571

Closed
wants to merge 1 commit into from
Closed

add tools to be able improve ISO for rhel4edge #571

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
9 changes: 8 additions & 1 deletion tasks/Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ RUN dnf -y update && \
dbus-glib \
diffstat \
expect \
file \
firefox \
fpaste \
gcc-c++ \
Expand All @@ -19,6 +20,7 @@ RUN dnf -y update && \
gnupg \
google-noto-cjk-fonts-common \
intltool \
isomd5sum \
jq \
lcov \
libappstream-glib \
Expand All @@ -27,14 +29,17 @@ RUN dnf -y update && \
libvirt-client \
libvirt-python3 \
libXt \
mtools \
nc \
net-tools \
nodejs-devel \
npm \
ostree \
Copy link
Member

Choose a reason for hiding this comment

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

What do you need this for? I'm rather sceptical that this will work in an unprivileged container. You can run toolbox create --image quay.io/cockpit/tasks -c cockpit to test it.

Copy link
Author

Choose a reason for hiding this comment

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

it is based on dependencies inside podman image what was used before: https://github.com/loadtheaccumulator/fleet-iso-util/

Copy link
Member

Choose a reason for hiding this comment

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

But https://github.com/loadtheaccumulator/fleet-iso-util/blob/main/fleetkick.sh doesn't use ostree anywhere?

passwd \
pigz \
psmisc \
procps-ng \
pykickstart \
python3 \
python3-build \
python3-flake8 \
Expand All @@ -48,10 +53,12 @@ RUN dnf -y update && \
rpmdevtools \
rsync \
socat \
syslinux \
Copy link
Member

Choose a reason for hiding this comment

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

This is certainly a curious thing to have in the tasks container -- certainly the rhel4edge builds from image builder already have a boot loader? We want to test these images, not apply a dozen hacks to fix their boot. What's that for?

strace \
tar \
vim-enhanced \
virt-install && \
virt-install \
xorriso && \
Comment on lines -54 to +61
Copy link
Member

Choose a reason for hiding this comment

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

The && needs to move a line up.

curl -o /tmp/cockpit.spec -s https://raw.githubusercontent.com/cockpit-project/cockpit/main/tools/cockpit.spec && \
dnf -y builddep --setopt=install_weak_deps=False /tmp/cockpit.spec && \
rm /tmp/cockpit.spec && \
Expand Down
Loading