workflow: refact with matrix; add arm64 EL7

Author: boypt

.github/workflows/build-images.yml

@@ -69,47 +69,29 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
-  build-arm64-el8:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push ARM64 EL8
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          platforms: linux/arm64
-          file: ./docker/Dockerfile.centos-stream
-          build-args: |
-            VERSION_NUM=8
-            CHINA_MIRROR=0
-          push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:aarch64_el8
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-  build-arm64-el9:
+  build-arm64:
     runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: write
+    strategy:
+      matrix:
+        include:
+          - tag_suffix: aarch64_el7
+            dockerfile: ./docker/Dockerfile.centos
+            build_args: |
+              VERSION_NUM=7
+              CHINA_MIRROR=0
+          - tag_suffix: aarch64_el8
+            dockerfile: ./docker/Dockerfile.centos-stream
+            build_args: |
+              VERSION_NUM=8
+              CHINA_MIRROR=0
+          - tag_suffix: aarch64_el9
+            dockerfile: ./docker/Dockerfile.centos-stream
+            build_args: |
+              VERSION_NUM=9
+              CHINA_MIRROR=0
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -127,16 +109,14 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build and push ARM64 EL9
+      - name: Build and push ${{ matrix.tag_suffix }}
         uses: docker/build-push-action@v5
         with:
           context: .
           platforms: linux/arm64
-          file: ./docker/Dockerfile.centos-stream
-          build-args: |
-            VERSION_NUM=9
-            CHINA_MIRROR=0
+          file: ${{ matrix.dockerfile }}
+          build-args: ${{ matrix.build_args }}
           push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:aarch64_el9
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ matrix.tag_suffix }}
           cache-from: type=gha
           cache-to: type=gha,mode=max

.github/workflows/build-rpm.yml

@@ -18,6 +18,9 @@ jobs:
     strategy:
       matrix:
         include:
+          - tag: aarch64_el7
+            el: "7"
+            arch: aarch64
           - tag: aarch64_el8
             el: "8"
             arch: aarch64