Merge pull request #4 from alicefr/add-cs

Build buildroot for centos stream 9

Author: alicefr

.github/workflows/buildroot.yml

@@ -38,34 +38,27 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build-x86_64:
-    runs-on: ubuntu-24.04
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v5
-
-      - name: Build container image
-        uses: redhat-actions/buildah-build@v2
-        with:
-          context: .github
-          image: ${{ env.NAME }}
-          tags: latest-x86_64
-          containerfiles: Containerfile
-          oci: true
-
-      - name: Push to Container Registry
-        uses: redhat-actions/push-to-registry@v2
-        id: push
-        if: (github.event_name == 'push' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/main'
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-          image: ${{ env.NAME }}
-          tags: latest-x86_64
-
-  build-aarch64:
-    runs-on: ubuntu-24.04-arm
+  build:
+    runs-on: ${{ matrix.runner }}
+    strategy:
+      matrix:
+        include:
+          - tag: fedora
+            base: quay.io/fedora/fedora:latest
+            arch: x86_64
+            runner: ubuntu-24.04
+          - tag: fedora
+            base: quay.io/fedora/fedora:latest
+            arch: aarch64
+            runner: ubuntu-24.04-arm
+          - tag: centos-stream
+            base: quay.io/centos/centos:stream9
+            arch: x86_64
+            runner: ubuntu-24.04
+          - tag: centos-stream
+            base: quay.io/centos/centos:stream9
+            arch: aarch64
+            runner: ubuntu-24.04-arm
     steps:
       - name: Checkout repo
         uses: actions/checkout@v5
@@ -75,9 +68,11 @@ jobs:
         with:
           context: .github
           image: ${{ env.NAME }}
-          tags: latest-aarch64
+          tags: ${{ matrix.tag }}-${{ matrix.arch }}
           containerfiles: Containerfile
           oci: true
+          build-args: |
+            BASE=${{ matrix.base }}
 
       - name: Push to Container Registry
         uses: redhat-actions/push-to-registry@v2
@@ -88,22 +83,24 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
           image: ${{ env.NAME }}
-          tags: latest-aarch64
+          tags: ${{ matrix.tag }}-${{ matrix.arch }}
 
   merge:
     runs-on: ubuntu-24.04
     needs:
-      - build-x86_64
-      - build-aarch64
+      - build
+    strategy:
+      matrix:
+        tag: [fedora, centos-stream]
     steps:
       - name: Create multi-arch manifest
         if: (github.event_name == 'push' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/main'
         shell: bash
         run: |
           set -euxo pipefail
-          buildah manifest create "${REGISTRY}/${NAME}:latest" \
-            "${REGISTRY}/${NAME}:latest-x86_64" \
-            "${REGISTRY}/${NAME}:latest-aarch64"
+          buildah manifest create "${REGISTRY}/${NAME}:${{ matrix.tag }}" \
+            "${REGISTRY}/${NAME}:${{ matrix.tag }}-x86_64" \
+            "${REGISTRY}/${NAME}:${{ matrix.tag }}-aarch64"
 
       - name: Push to Container Registry
         uses: redhat-actions/push-to-registry@v2
@@ -114,4 +111,4 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
           image: ${{ env.NAME }}
-          tags: latest
+          tags: ${{ matrix.tag }}

Containerfile

@@ -1,7 +1,8 @@
 # SPDX-FileCopyrightText: Timothée Ravier <tim@siosm.fr>
 # SPDX-License-Identifier: CC0-1.0
 
-FROM quay.io/fedora/fedora:latest
+ARG BASE
+FROM $BASE
 
 RUN dnf install -y \
         cargo \
@@ -10,7 +11,6 @@ RUN dnf install -y \
         git \
         golang \
         jq \
-        just \
         openssl-devel \
         podman \
         rustfmt \