Also build for arm64

.github/workflows/pull_request.yaml

@@ -182,10 +182,15 @@ jobs:
     runs-on: ubuntu-22.04
     needs: [site_unit_tests, server_unit_tests]
     if: github.repository == 'OWASP/threat-dragon'
+    outputs:
+      image_is_pushed: ${{ steps.set-outputs.outputs.CREDS_PRESENT }}
     steps:
       - name: Checkout
         uses: actions/[email protected]
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/[email protected]
@@ -202,9 +207,12 @@ jobs:
 
       - name: Login to Docker Hub
         uses: docker/[email protected]
+        if: ${{ env.DOCKERHUB_TOKEN != '' }}
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+        env:
+          DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push
         id: docker_build
@@ -213,15 +221,22 @@ jobs:
           context: ./
           file: ./Dockerfile
           builder: ${{ steps.buildx.outputs.name }}
-          push: true
+          push: ${{ env.DOCKERHUB_TOKEN != '' }}
           tags:  ${{ env.IMAGE_NAME }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
+          platforms: linux/amd64,linux/arm64
+
+      - name: Set outputs
+        id: set-outputs
+        run: |-
+          echo "CREDS_PRESENT=${{ secrets.DOCKERHUB_TOKEN != ''}}" >> $GITHUB_OUTPUT
 
   e2e_smokes:
     name: Site e2e smokes
     runs-on: ubuntu-22.04
     needs: [build_docker_image]
+    if: ${{ needs.build_docker_image.outputs.image_is_pushed == 'true'}}
     defaults:
       run:
         working-directory: td.vue
@@ -322,6 +337,7 @@ jobs:
     name: Site zap scan
     runs-on: ubuntu-22.04
     needs: [build_docker_image]
+    if: ${{ needs.build_docker_image.outputs.image_is_pushed == 'true'}}
     steps:
       - name: Run Threat Dragon
         run: |
@@ -369,6 +385,7 @@ jobs:
     name: Scan with trivy
     runs-on: ubuntu-22.04
     needs: [build_docker_image]
+    if: ${{ needs.build_docker_image.outputs.image_is_pushed == 'true'}}
     permissions:
       contents: write
 

.github/workflows/push.yaml

@@ -222,6 +222,9 @@ jobs:
       - name: Checkout
         uses: actions/[email protected]
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/[email protected]
@@ -253,6 +256,7 @@ jobs:
           tags:  ${{ env.IMAGE_NAME }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
+          platforms: linux/amd64,linux/arm64
 
   heroku_deploy:
     name: Upload to Heroku

.github/workflows/release.yaml

@@ -346,6 +346,9 @@ jobs:
       - name: Checkout
         uses: actions/[email protected]
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/[email protected]
@@ -377,6 +380,7 @@ jobs:
           tags: ${{ env.IMAGE_NAME }}:${{ github.ref_name }},${{ env.IMAGE_NAME }}:stable
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
+          platforms: linux/amd64,linux/arm64
 
   webapp_release:
     name: Publish web application

release-process.md

@@ -22,11 +22,9 @@ The github release workflow then creates the draft release and the install image
 
 1. once tagged, the github workflow pushes the docker image to docker hub
 2. check using `docker pull threatdragon/owasp-threat-dragon:v2.2.0`
-3. on MacOS M1 this command may need to be used:
-    `docker pull --platform linux/x86_64 threatdragon/owasp-threat-dragon:v2.2.0`
-4. Test using the command to run a detached container:
+3. Test using the command to run a detached container:
     `docker run -d -p 8080:3000 -v $(pwd)/.env:/app/.env threatdragon/owasp-threat-dragon:v2.2.0`
-5. Ideally test this release on Windows, linux and MacOS using `http://localhost:8080/#/`
+4. Ideally test this release on Windows, linux and MacOS using `http://localhost:8080/#/`
 
 If the image tests correctly, promote the docker image
 from dockerhub `threatdragon/` to dockerhub `OWASP/threat-dragon/v2.2.0`.