arch

Author: Azathothas

.github/workflows/build_gh_runner_images.yaml

@@ -741,11 +741,19 @@ jobs:
           push: true
         continue-on-error: true
 #------------------------------------------------------------------------------------#
-  build-push-docker-debian-guix-aarch64:
+  build-push-docker-debian-guix:
     name: Push (debian-guix) --> Docker Hub
-    #runs-on: ubuntu-latest
-    runs-on: ubuntu-24.04-arm
     needs: [build-push-debian-unstable-base]
+    runs-on: ${{ matrix.runner }}
+    strategy:
+      matrix:
+        include:
+          - arch: ${{ matrix.arch }}
+            platform: amd64
+            runner: ubuntu-24.04-arm
+          - arch: x86_64
+            platform: arm64
+            runner: ubuntu-latest
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -803,84 +811,14 @@ jobs:
         with:
           context: /tmp/DOCKERFILES/
           file: "/tmp/DOCKERFILES/debian-guix.dockerfile"
-          #platforms: "linux/amd64,linux/arm64"
-          platforms: "linux/arm64"
-          tags: |
-            pkgforge/debian-guix.dockerfile:aarch64
-            pkgforge/debian-guix.dockerfile:aarch64-${{ env.DOCKER_TAG }}
-            ghcr.io/pkgforge/devscripts/debian-guix.dockerfile:aarch64
-            ghcr.io/pkgforge/devscripts/debian-guix.dockerfile:aarch64-${{ env.DOCKER_TAG }}
-          push: true
-        continue-on-error: true
-#------------------------------------------------------------------------------------#
-  build-push-docker-debian-guix-x86-64:
-    name: Push (debian-guix) --> Docker Hub
-    runs-on: ubuntu-latest
-    needs: [build-push-debian-unstable-base]
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          path: main
-          filter: "blob:none"
-  
-      - name: Debloat Runner
-        run: |
-          #Presets
-          set +x ; set +e
-          #--------------#
-          bash <(curl -qfsSL "https://raw.githubusercontent.com/pkgforge/devscripts/refs/heads/main/Github/Runners/debloat_ubuntu.sh")
-        continue-on-error: true
-        
-      - name: Setup Env
-        run: |
-          #Presets
-          set +x ; set +e
-          #--------------#
-          #Docker Tags
-          DOCKER_TAG="v$(date +'%Y.%m.%d')" && export DOCKER_TAG="${DOCKER_TAG}"
-          echo "DOCKER_TAG=${DOCKER_TAG}" >> "${GITHUB_ENV}"
-          #Copy dockerfiles
-          mkdir -p "/tmp/DOCKERFILES" && cd "/tmp/DOCKERFILES"
-          cp "${GITHUB_WORKSPACE}/main/Github/Runners/debian-guix.dockerfile" "/tmp/DOCKERFILES/debian-guix.dockerfile"
-        continue-on-error: true
-  
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        continue-on-error: true
-  
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        continue-on-error: true
-  
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: "${{ secrets.DOCKERHUB_USERNAME }}"
-          password: "${{ secrets.DOCKERHUB_TOKEN }}"
-        continue-on-error: true
-  
-      - name: Login to GHCR
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: "${{ github.actor }}"
-          password: "${{ secrets.GITHUB_TOKEN }}"
-        continue-on-error: true
-  
-    #https://hub.docker.com/r/pkgforge/debian-guix
-      - name: Docker Build and Push (debian-guix)
-        uses: docker/build-push-action@v6
-        with:
-          context: /tmp/DOCKERFILES/
-          file: "/tmp/DOCKERFILES/debian-guix.dockerfile"
-          #platforms: "linux/amd64,linux/arm64"
-          platforms: "linux/amd64"
+          platforms: "linux/${{ matrix.platform }}"
+          build-args: |
+            ARCH=$(uname -m)
           tags: |
-            pkgforge/debian-guix:x86_64
-            pkgforge/debian-guix:x86_64-${{ env.DOCKER_TAG }}
-            ghcr.io/pkgforge/devscripts/debian-guix:x86_64
-            ghcr.io/pkgforge/devscripts/debian-guix:x86_64-${{ env.DOCKER_TAG }}
+            pkgforge/debian-guix.dockerfile:${{ matrix.arch }}
+            pkgforge/debian-guix.dockerfile:${{ matrix.arch }}-${{ env.DOCKER_TAG }}
+            ghcr.io/pkgforge/devscripts/debian-guix.dockerfile:${{ matrix.arch }}
+            ghcr.io/pkgforge/devscripts/debian-guix.dockerfile:${{ matrix.arch }}-${{ env.DOCKER_TAG }}
           push: true
         continue-on-error: true
 #------------------------------------------------------------------------------------#

Github/Runners/debian-guix.dockerfile

@@ -1,7 +1,8 @@
 # syntax=docker/dockerfile:1
 #------------------------------------------------------------------------------------#
 #https://hub.docker.com/r/pkgforge/debian-guix
-FROM pkgforge/debian-builder-unstable:latest
+FROM ARG ARCH
+FROM "pkgforge/debian-builder-unstable:${ARCH}"
 #------------------------------------------------------------------------------------#
 ##Install
 RUN <<EOS