Merging upstream version 102.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 56 insertions, 17 deletions

diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
index d8c8808..666f887 100644
--- a/.github/workflows/container.yml
+++ b/.github/workflows/container.yml
@@ -3,12 +3,12 @@ on:
     schedule:
         -  cron: '30 11 * * *'   # every day at 11:30 UTC
     push:
-        branches: [ master ]
+        branches: [ main ]
         paths:
             - 'test/container/**'
             - '.github/workflows/container.yml'
     pull_request:
-        branches: [ master ]
+        branches: [ main ]
         paths:
             - 'test/container/**'
             - '.github/workflows/container.yml'
@@ -18,30 +18,68 @@ permissions:
     contents: read
 
 jobs:
-    push_to_registry:
-        if: github.repository == 'dracutdevs/dracut' || vars.CONTAINER == 'enabled'
-        name: Build and push containers image to GitHub Packages
+    arm64:
+        if: github.repository == 'dracut-ng/dracut-ng' || vars.CONTAINER == 'enabled'
+        name: ${{ matrix.config.tag }} on ${{ matrix.config.platform }}
         runs-on: ubuntu-latest
         concurrency:
-            group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.config.dockerfile }}
+            group: arm64-${{ github.workflow }}-${{ github.ref }}-${{ matrix.config.dockerfile }}
             cancel-in-progress: true
         strategy:
             fail-fast: false
             matrix:
                 config:
-                    - { dockerfile: 'Dockerfile-Fedora-latest',     tag: 'fedora:latest' }
-                    - { dockerfile: 'Dockerfile-OpenSuse-latest',   tag: 'opensuse:latest' }
-                    - { dockerfile: 'Dockerfile-Arch',              tag: 'arch:latest' }
-                    - { dockerfile: 'Dockerfile-Debian',            tag: 'debian:latest' }
-                    - { dockerfile: 'Dockerfile-Gentoo',            tag: 'gentoo:latest' }
-                    - { dockerfile: 'Dockerfile-Ubuntu',            tag: 'ubuntu:latest' }
+                    - { dockerfile: 'Dockerfile-Debian',            tag: 'debian',     platform: 'linux/arm64,linux/amd64' }
+                    - { dockerfile: 'Dockerfile-Fedora-latest',     tag: 'fedora',     platform: 'linux/arm64,linux/amd64' }
+        steps:
+            -   name: Set up QEMU
+                uses: docker/setup-qemu-action@v3
+                with:
+                    platforms: ${{ matrix.config.platform }}
+            -   name: Check out the repo
+                uses: actions/checkout@v4
+            -   name: Set up Docker Buildx
+                uses: docker/setup-buildx-action@v3
+            -   name: Login to GitHub Container Registry
+                uses: docker/login-action@v3
+                with:
+                    registry: ghcr.io
+                    username: ${{ github.repository_owner }}
+                    password: ${{ secrets.GITHUB_TOKEN }}
+            -   name: Set up env
+                run: echo "repository_owner=${GITHUB_REPOSITORY_OWNER,,}" >>${GITHUB_ENV}
+            -   name: Build and Push Container
+                uses: docker/build-push-action@v5
+                with:
+                    file: test/container/${{ matrix.config.dockerfile }}
+                    tags: ghcr.io/${{env.repository_owner}}/${{ matrix.config.tag }}:latest
+                    push: ${{ github.event_name == 'push' ||  github.event_name == 'schedule' }}
+                    platforms: ${{ matrix.config.platform }}
+
+    amd64:
+        if: github.repository == 'dracut-ng/dracut-ng' || vars.CONTAINER == 'enabled'
+        name: ${{ matrix.config.tag }} on ${{ matrix.config.platform }}
+        runs-on: ubuntu-latest
+        concurrency:
+            group: amd64-${{ github.workflow }}-${{ github.ref }}-${{ matrix.config.dockerfile }}
+            cancel-in-progress: true
+        strategy:
+            fail-fast: false
+            matrix:
+                config:
+                    - { dockerfile: 'Dockerfile-OpenSuse-latest',   tag: 'opensuse',   platform: 'linux/amd64' }
+                    - { dockerfile: 'Dockerfile-Arch',              tag: 'arch',       platform: 'linux/amd64' }
+                    - { dockerfile: 'Dockerfile-Gentoo',            tag: 'gentoo',     platform: 'linux/amd64' }
+                    - { dockerfile: 'Dockerfile-Ubuntu',            tag: 'ubuntu',     platform: 'linux/amd64' }
+                    - { dockerfile: 'Dockerfile-alpine',            tag: 'alpine',     platform: 'linux/amd64' }
+                    - { dockerfile: 'Dockerfile-Void',              tag: 'void',       platform: 'linux/amd64' }
         steps:
             -   name: Check out the repo
-                uses: actions/checkout@v3
+                uses: actions/checkout@v4
             -   name: Set up Docker Buildx
-                uses: docker/setup-buildx-action@v2
+                uses: docker/setup-buildx-action@v3
             -   name: Login to GitHub Container Registry
-                uses: docker/login-action@v2
+                uses: docker/login-action@v3
                 with:
                     registry: ghcr.io
                     username: ${{ github.repository_owner }}
@@ -49,8 +87,9 @@ jobs:
             -   name: Set up env
                 run: echo "repository_owner=${GITHUB_REPOSITORY_OWNER,,}" >>${GITHUB_ENV}
             -   name: Build and Push Container
-                uses: docker/build-push-action@v4
+                uses: docker/build-push-action@v5
                 with:
                     file: test/container/${{ matrix.config.dockerfile }}
-                    tags: ghcr.io/${{env.repository_owner}}/${{ matrix.config.tag }}
+                    tags: ghcr.io/${{env.repository_owner}}/${{ matrix.config.tag }}:latest
                     push: ${{ github.event_name == 'push' ||  github.event_name == 'schedule' }}
+                    platforms: ${{ matrix.config.platform }}