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

ci: migrate from systemd-boot to systemd-utils in Gentoo container #2463

Merged
merged 1 commit into from
Aug 1, 2023
Merged

ci: migrate from systemd-boot to systemd-utils in Gentoo container #2463

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
15 changes: 7 additions & 8 deletions test/container/Dockerfile-Gentoo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@ FROM docker.io/gentoo/stage3 as efistub
COPY --from=portage /var/db/repos/gentoo /var/db/repos/gentoo

# systemd-boot
RUN mkdir -p /etc/portage/package.accept_keywords && \
echo "sys-boot/systemd-boot" >> /etc/portage/package.accept_keywords/systemd-boot && \
echo '>=sys-apps/systemd-utils-251.10 boot' > /etc/portage/package.use/systemd-boot && \
emerge -qv sys-boot/systemd-boot
RUN echo 'sys-apps/systemd-utils boot' > /etc/portage/package.use/systemd-utils && \
emerge -qv sys-apps/systemd-utils

# kernel and its dependencies in a separate builder
FROM docker.io/gentoo/stage3:$TAG as kernel
Expand All @@ -28,13 +26,15 @@ ARG TAG
MAINTAINER https://github.com/dracutdevs/dracut

# required by sys-fs/dmraid
RUN echo '>=sys-fs/lvm2-2.03.20 lvm thin' > /etc/portage/package.use/lvm2
RUN echo 'sys-fs/lvm2 lvm thin' > /etc/portage/package.use/lvm2

# workaround for https://bugs.gentoo.org/734022 whereby Gentoo does not support NFS4 with musl
RUN if [[ "$TAG" == 'musl' ]]; then echo 'net-fs/nfs-utils -nfsv4' > /etc/portage/package.use/nfs-utils ; fi

# workaround for https://bugs.gentoo.org/713490 whereby Gentoo does not support tgt with musl
RUN if [[ "$TAG" != 'musl' ]]; then emerge -qv sys-block/tgt ; fi
# workaround for packages do not compile on musl
# https://bugs.gentoo.org/713490 for tgt
# https://bugs.gentoo.org/908587 for open-iscsi
RUN if [[ "$TAG" != 'musl' ]]; then emerge -qv sys-block/tgt sys-block/open-iscsi ; fi

# Install needed packages for the dracut CI container
RUN emerge -qv \
Expand All @@ -45,7 +45,6 @@ RUN emerge -qv \
net-misc/dhcp \
sys-apps/busybox \
sys-block/nbd \
sys-block/open-iscsi \
sys-block/parted \
sys-fs/btrfs-progs \
sys-fs/cryptsetup \
Expand Down
Loading