add arm64 build to Snap and appImage

OWASP · Jul 8, 2024 · f1d952d · f1d952d
1 parent 8915687
commit f1d952d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml
@@ -171,7 +171,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push amd64 to Docker Hub
-        id: docker_build_amd64
+        id: docker_build
         uses: docker/build-push-action@v6.3.0
         with:
           context: ./

diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml
@@ -185,6 +185,7 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      # platform manifests not (yet) supported, so split out architectures
       - name: Build and push amd64 to Docker Hub
         id: docker_build_amd64
         uses: docker/build-push-action@v6.3.0
@@ -216,7 +217,7 @@ jobs:
       - name: fetch app SBOMs
         run: docker run --rm --entrypoint tar "$IMAGE_ID" -c boms | tar -xv
         env:
-          IMAGE_ID: ${{ steps.docker_build.outputs.imageid }}
+          IMAGE_ID: ${{ steps.docker_build_amd64.outputs.imageid }}
 
       - name: Save SBOM artifact
         uses: actions/upload-artifact@v4.3.0

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -364,6 +364,7 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      # platform manifests not (yet) supported, so split out architectures
       - name: Build and push amd64 to Docker Hub
         id: docker_build_amd64
         uses: docker/build-push-action@v6.3.0
@@ -395,7 +396,7 @@ jobs:
       - name: fetch app SBOM
         run: docker run --rm --entrypoint tar "$IMAGE_ID" -c boms | tar -xv
         env:
-          IMAGE_ID: ${{ steps.docker_build.outputs.imageid }}
+          IMAGE_ID: ${{ steps.docker_build_amd64.outputs.imageid }}
 
       - name: Save SBOM artifact
         uses: actions/upload-artifact@v4.3.0

diff --git a/td.vue/vue.config.js b/td.vue/vue.config.js
@@ -68,8 +68,14 @@ module.exports = {
                     icon: './src/icons/td-256.png',
                     synopsis: 'OWASP Threat Dragon',
                     target: [
-                        'AppImage',
-                        'snap',
+                        {
+                            target: 'AppImage',
+                            arch: ['arm64', 'x64']
+                        },
+                        {
+                            target: 'snap',
+                            arch: ['arm64', 'x64']
+                        },
                         'deb',
                         'rpm'
                     ]