ci: bring back musl/openrc option for Gentoo

diff --git a/.github/workflows/container-extra.yml b/.github/workflows/container-extra.yml
index ba0e73849001408e51bced4a41e5293f13402c6f..ef2e44f394c8b89c9f9a2c951f0f6f3cc76f06b5 100644 (file)
--- a/.github/workflows/container-extra.yml
+++ b/.github/workflows/container-extra.yml
@@ -36,8 +36,8 @@ jobs:
                     - { dockerfile: 'Dockerfile-debian', tag: 'debian:sid',     platform: 'linux/amd64' }
                     - { dockerfile: 'Dockerfile-ubuntu', tag: 'ubuntu:rolling', platform: 'linux/amd64' }
                     - { dockerfile: 'Dockerfile-alpine', tag: 'alpine:edge',    platform: 'linux/amd64' }
-                    - { dockerfile: 'Dockerfile-gentoo', tag: 'gentoo:latest',  platform: 'linux/amd64' }
-                    - { dockerfile: 'Dockerfile-gentoo', tag: 'gentoo:slim',    platform: 'linux/amd64', extrapackages: 'no' }
+                    - { dockerfile: 'Dockerfile-gentoo', tag: 'gentoo:latest',  platform: 'linux/amd64', option: 'systemd' }
+                    - { dockerfile: 'Dockerfile-gentoo', tag: 'gentoo:musl',    platform: 'linux/amd64', option: 'musl' }
                     - { dockerfile: 'Dockerfile-fedora', tag: 'fedora:rawhide', platform: 'linux/amd64', registry: 'registry.fedoraproject.org' }
                     - { dockerfile: 'Dockerfile-fedora', tag: 'centos:stream10-development', platform: 'linux/amd64', registry: 'quay.io/centos' }
         steps:
@@ -63,7 +63,7 @@ jobs:
                     build-args: |
                         DISTRIBUTION=${{ matrix.config.tag }}
                         REGISTRY=${{ matrix.config.registry }}
-                        EXTRAPACKAGES=${{ matrix.config.extrapackages }}
+                        OPTION=${{ matrix.config.option }}
 
     arm64:
         if: github.repository == 'dracut-ng/dracut-ng' || vars.CONTAINER == 'enabled'

diff --git a/test/container/Dockerfile-gentoo b/test/container/Dockerfile-gentoo
index b39f0453770d744b6cd8313d1f1bfdee6ed1c8ca..c9d30389273a7629b97f9401ee456ed2b75d485c 100644 (file)
--- a/test/container/Dockerfile-gentoo
+++ b/test/container/Dockerfile-gentoo
@@ -1,4 +1,5 @@
 # Test coverage provided by this container:
+# - glibc/systemd or musl/openrc
 # - systemd-networkd
 # - bash
 
@@ -9,22 +10,15 @@
 # - rng-tools (to increase coverage)
 # - ntfs3g (to keep container small)
 
-ARG EXTRAPACKAGES=yes
+ARG OPTION=systemd
 
 FROM docker.io/gentoo/portage:latest AS portage
 
-FROM docker.io/gentoo/stage3:systemd
+FROM docker.io/gentoo/stage3:${OPTION}
 COPY --from=portage /var/db/repos/gentoo /var/db/repos/gentoo
 
 # export ARG
-ARG EXTRAPACKAGES
-
-# Dependencies for full testsuite
-RUN \
-if [ "$EXTRAPACKAGES" != "no" ] ; then \
-    emerge --quiet --deep --autounmask-continue=y --with-bdeps=n --noreplace \
-    app-alternatives/bc \
-; fi
+ARG OPTION
 
 RUN \
     # Speed-up using binpkgs \
@@ -51,17 +45,15 @@ RUN emerge --quiet --deep --autounmask-continue=y --with-bdeps=n --noreplace \
     app-text/asciidoc \
     app-text/docbook-xml-dtd \
     app-text/docbook-xsl-stylesheets \
-    sys-apps/systemd \
     sys-kernel/dracut \
     sys-kernel/gentoo-kernel-bin \
-    sys-libs/glibc \
     sys-libs/libxcrypt \
     virtual/libelf \
     virtual/pkgconfig
 
 # Dependencies for full testsuite
 RUN \
-if [ "$EXTRAPACKAGES" != "no" ] ; then \
+if [ "$OPTION" = "systemd" ] ; then \
     emerge --quiet --deep --autounmask-continue=y --with-bdeps=n --noreplace \
     app-alternatives/bc \
     app-crypt/swtpm \
@@ -74,6 +66,7 @@ if [ "$EXTRAPACKAGES" != "no" ] ; then \
     net-fs/nfs-utils \
     net-misc/dhcp \
     net-wireless/bluez \
+    sys-apps/systemd \
     sys-apps/nvme-cli \
     sys-block/nbd \
     sys-block/open-iscsi \
@@ -88,6 +81,7 @@ if [ "$EXTRAPACKAGES" != "no" ] ; then \
     sys-fs/mdadm \
     sys-fs/multipath-tools \
     sys-fs/squashfs-tools \
+    sys-libs/glibc \
 ; fi
 
 # cleanup