refactoring workflows

.github/workflows/docker-image.yml

@@ -1,4 +1,4 @@
-name: Create and publish a Docker image
+name: Create and publish Docker images
 
 on:
   release:
@@ -10,7 +10,7 @@ env:
   IMAGE_NAME: ${{ github.repository }}
 
 jobs:
-  build-and-push-image:
+  build-amd64:
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -26,11 +26,6 @@ jobs:
       - name: Run tests
         run: sudo apt-get install -y iperf3 && cd tests && ./run_tests.sh
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@master
-        with:
-          platforms: all
-
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@master
@@ -47,22 +42,182 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          
       - name: Extract tag name
         id: tag
         run: echo TAG_NAME=$(echo $GITHUB_REF | cut -d / -f 3) >> $GITHUB_OUTPUT
+        
       - name: Update version in setup.py
         run: >-
           sed -i "s/{{VERSION_PLACEHOLDER}}/${{ steps.tag.outputs.TAG_NAME }}/g" backend/utils/__init__.py;
           sed -i "s/{{VERSION_PLACEHOLDER}}/${{ steps.tag.outputs.TAG_NAME }}/g" fgex-lib/setup.py;
           sed -i "s/{{VERSION_PLACEHOLDER}}/${{ steps.tag.outputs.TAG_NAME }}/g" fgex-lib/firegex/__init__.py;
-      - name: Build and push Docker image
+          
+      - name: Build and push AMD64 Docker image
         uses: docker/build-push-action@v5
         with:
           context: .
           builder: ${{ steps.buildx.outputs.name }}
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
           push: true
-          tags: ${{ steps.meta.outputs.tags }}
+          tags: ${{ steps.meta.outputs.tags }}-amd64
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-from: type=gha,scope=amd64
+          cache-to: type=gha,mode=max,scope=amd64
+
+  build-arm64:
+    runs-on: ubuntu-latest-arm64
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Build and run firegex
+        run: python3 start.py start -P testpassword
+        
+      - name: Run tests
+        run: sudo apt-get install -y iperf3 && cd tests && ./run_tests.sh
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@master
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          
+      - name: Extract tag name
+        id: tag
+        run: echo TAG_NAME=$(echo $GITHUB_REF | cut -d / -f 3) >> $GITHUB_OUTPUT
+        
+      - name: Update version in setup.py
+        run: >-
+          sed -i "s/{{VERSION_PLACEHOLDER}}/${{ steps.tag.outputs.TAG_NAME }}/g" backend/utils/__init__.py;
+          sed -i "s/{{VERSION_PLACEHOLDER}}/${{ steps.tag.outputs.TAG_NAME }}/g" fgex-lib/setup.py;
+          sed -i "s/{{VERSION_PLACEHOLDER}}/${{ steps.tag.outputs.TAG_NAME }}/g" fgex-lib/firegex/__init__.py;
+          
+      - name: Build and push ARM64 Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          builder: ${{ steps.buildx.outputs.name }}
+          platforms: linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}-arm64
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha,scope=arm64
+          cache-to: type=gha,mode=max,scope=arm64
+
+  create-manifest:
+    runs-on: ubuntu-latest
+    needs: [build-amd64, build-arm64]
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          
+      - name: Create and push multi-platform manifest
+        run: |
+          # Create manifest list
+          docker buildx imagetools create \
+            --tag ${{ steps.meta.outputs.tags }} \
+            ${{ steps.meta.outputs.tags }}-amd64 \
+            ${{ steps.meta.outputs.tags }}-arm64
+
+  create-rootfs-assets:
+    runs-on: ubuntu-latest
+    needs: [create-manifest]
+    permissions:
+      contents: write
+      packages: read
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@master
+        with:
+          platforms: all
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@master
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get latest release tag
+        id: get_tag
+        run: |
+          LATEST_TAG=$(curl -s https://api.github.com/repos/${{ github.repository }}/releases/latest | jq -r '.tag_name')
+          echo "tag=$LATEST_TAG" >> $GITHUB_OUTPUT
+          echo "Latest release tag: $LATEST_TAG"
+
+      - name: Export rootfs for amd64
+        run: |
+          echo "Creating and exporting amd64 container..."
+          CONTAINER_ID=$(docker create --platform linux/amd64 ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.get_tag.outputs.tag }})
+          docker export $CONTAINER_ID --output="firegex-rootfs-amd64.tar"
+          docker rm $CONTAINER_ID
+          echo "Compressing amd64 rootfs..."
+          gzip firegex-rootfs-amd64.tar
+          ls -lh firegex-rootfs-amd64.tar.gz
+
+      - name: Export rootfs for arm64
+        run: |
+          echo "Creating and exporting arm64 container..."
+          CONTAINER_ID=$(docker create --platform linux/arm64 ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.get_tag.outputs.tag }})
+          docker export $CONTAINER_ID --output="firegex-rootfs-arm64.tar"
+          docker rm $CONTAINER_ID
+          echo "Compressing arm64 rootfs..."
+          gzip firegex-rootfs-arm64.tar
+          ls -lh firegex-rootfs-arm64.tar.gz
+
+      - name: Calculate checksums
+        run: |
+          echo "Calculating checksums..."
+          sha256sum firegex-rootfs-amd64.tar.gz > firegex-rootfs-amd64.tar.gz.sha256
+          sha256sum firegex-rootfs-arm64.tar.gz > firegex-rootfs-arm64.tar.gz.sha256
+          cat *.sha256
+
+      - name: Upload rootfs assets to release
+        run: |
+          echo "Uploading assets to release ${{ steps.get_tag.outputs.tag }}..."
+          gh release upload ${{ steps.get_tag.outputs.tag }} \
+            firegex-rootfs-amd64.tar.gz \
+            firegex-rootfs-amd64.tar.gz.sha256 \
+            firegex-rootfs-arm64.tar.gz \
+            firegex-rootfs-arm64.tar.gz.sha256 \
+            --clobber
+          echo "Assets uploaded successfully!"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/docker-rootfs-asset.yml

@@ -1,87 +0,0 @@
-name: Create Docker rootfs assets
-
-on:
-  workflow_run:
-    workflows: ["Create and publish a Docker image"]
-    types:
-      - completed
-    branches:
-      - main
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
-
-jobs:
-  create-rootfs-assets:
-    runs-on: ubuntu-latest
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
-    permissions:
-      contents: write
-      packages: read
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@master
-        with:
-          platforms: all
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@master
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Get latest release tag
-        id: get_tag
-        run: |
-          LATEST_TAG=$(curl -s https://api.github.com/repos/${{ github.repository }}/releases/latest | jq -r '.tag_name')
-          echo "tag=$LATEST_TAG" >> $GITHUB_OUTPUT
-          echo "Latest release tag: $LATEST_TAG"
-
-      - name: Export rootfs for amd64
-        run: |
-          echo "Creating and exporting amd64 container..."
-          CONTAINER_ID=$(docker create --platform linux/amd64 ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.get_tag.outputs.tag }})
-          docker export $CONTAINER_ID --output="firegex-rootfs-amd64.tar"
-          docker rm $CONTAINER_ID
-          echo "Compressing amd64 rootfs..."
-          gzip firegex-rootfs-amd64.tar
-          ls -lh firegex-rootfs-amd64.tar.gz
-
-      - name: Export rootfs for arm64
-        run: |
-          echo "Creating and exporting arm64 container..."
-          CONTAINER_ID=$(docker create --platform linux/arm64 ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.get_tag.outputs.tag }})
-          docker export $CONTAINER_ID --output="firegex-rootfs-arm64.tar"
-          docker rm $CONTAINER_ID
-          echo "Compressing arm64 rootfs..."
-          gzip firegex-rootfs-arm64.tar
-          ls -lh firegex-rootfs-arm64.tar.gz
-
-      - name: Calculate checksums
-        run: |
-          echo "Calculating checksums..."
-          sha256sum firegex-rootfs-amd64.tar.gz > firegex-rootfs-amd64.tar.gz.sha256
-          sha256sum firegex-rootfs-arm64.tar.gz > firegex-rootfs-arm64.tar.gz.sha256
-          cat *.sha256
-
-      - name: Upload rootfs assets to release
-        run: |
-          echo "Uploading assets to release ${{ steps.get_tag.outputs.tag }}..."
-          gh release upload ${{ steps.get_tag.outputs.tag }} \
-            firegex-rootfs-amd64.tar.gz \
-            firegex-rootfs-amd64.tar.gz.sha256 \
-            firegex-rootfs-arm64.tar.gz \
-            firegex-rootfs-arm64.tar.gz.sha256 \
-            --clobber
-          echo "Assets uploaded successfully!"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}