for idaholab#389, enable arm64 platform for GitHub workflow builds

mmguero-dev · May 6, 2024 · ac82c26 · ac82c26
1 parent 0cd4f2f
commit ac82c26
Show file tree

Hide file tree

Showing 20 changed files with 80 additions and 0 deletions.
diff --git a/.github/workflows/api-build-and-push-ghcr.yml b/.github/workflows/api-build-and-push-ghcr.yml
@@ -65,7 +65,10 @@ jobs:
         id: extract_malcolm_version
       -
         name: Set up QEMU
+        id: setup-qemu
         uses: docker/setup-qemu-action@v3
+        with:
+          platforms: amd64,arm64
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -90,6 +93,7 @@ jobs:
             BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
             VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: ghcr.io/${{ github.repository_owner }}/malcolm/api:${{ steps.extract_branch.outputs.branch }}
       -
         name: Run Trivy vulnerability scanner

diff --git a/.github/workflows/arkime-build-and-push-ghcr.yml b/.github/workflows/arkime-build-and-push-ghcr.yml
@@ -65,7 +65,10 @@ jobs:
         id: extract_malcolm_version
       -
         name: Set up QEMU
+        id: setup-qemu
         uses: docker/setup-qemu-action@v3
+        with:
+          platforms: amd64,arm64
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -91,6 +94,7 @@ jobs:
             VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}
             MAXMIND_GEOIP_DB_LICENSE_KEY=${{ secrets.MAXMIND_GEOIP_DB_LICENSE_KEY }}
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: ghcr.io/${{ github.repository_owner }}/malcolm/arkime:${{ steps.extract_branch.outputs.branch }}
       -
         name: Run Trivy vulnerability scanner

diff --git a/.github/workflows/dashboards-build-and-push-ghcr.yml b/.github/workflows/dashboards-build-and-push-ghcr.yml
@@ -65,7 +65,10 @@ jobs:
         id: extract_malcolm_version
       -
         name: Set up QEMU
+        id: setup-qemu
         uses: docker/setup-qemu-action@v3
+        with:
+          platforms: amd64,arm64
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -90,6 +93,7 @@ jobs:
             BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
             VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: ghcr.io/${{ github.repository_owner }}/malcolm/dashboards:${{ steps.extract_branch.outputs.branch }}
       -
         name: Run Trivy vulnerability scanner

diff --git a/.github/workflows/dashboards-helper-build-and-push-ghcr.yml b/.github/workflows/dashboards-helper-build-and-push-ghcr.yml
@@ -65,7 +65,10 @@ jobs:
         id: extract_malcolm_version
       -
         name: Set up QEMU
+        id: setup-qemu
         uses: docker/setup-qemu-action@v3
+        with:
+          platforms: amd64,arm64
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -90,6 +93,7 @@ jobs:
             BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
             VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: ghcr.io/${{ github.repository_owner }}/malcolm/dashboards-helper:${{ steps.extract_branch.outputs.branch }}
       -
         name: Run Trivy vulnerability scanner

diff --git a/.github/workflows/dirinit-build-and-push-ghcr.yml b/.github/workflows/dirinit-build-and-push-ghcr.yml
@@ -53,7 +53,10 @@ jobs:
         id: extract_malcolm_version
       -
         name: Set up QEMU
+        id: setup-qemu
         uses: docker/setup-qemu-action@v3
+        with:
+          platforms: amd64,arm64
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -78,6 +81,7 @@ jobs:
             BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
             VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: ghcr.io/${{ github.repository_owner }}/malcolm/dirinit:${{ steps.extract_branch.outputs.branch }}
       -
         name: Run Trivy vulnerability scanner

diff --git a/.github/workflows/file-monitor-build-and-push-ghcr.yml b/.github/workflows/file-monitor-build-and-push-ghcr.yml
@@ -63,7 +63,10 @@ jobs:
         id: extract_malcolm_version
       -
         name: Set up QEMU
+        id: setup-qemu
         uses: docker/setup-qemu-action@v3
+        with:
+          platforms: amd64,arm64
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -88,6 +91,7 @@ jobs:
             BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
             VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: ghcr.io/${{ github.repository_owner }}/malcolm/file-monitor:${{ steps.extract_branch.outputs.branch }}
       -
         name: Run Trivy vulnerability scanner

diff --git a/.github/workflows/file-upload-build-and-push-ghcr.yml b/.github/workflows/file-upload-build-and-push-ghcr.yml
@@ -65,7 +65,10 @@ jobs:
         id: extract_malcolm_version
       -
         name: Set up QEMU
+        id: setup-qemu
         uses: docker/setup-qemu-action@v3
+        with:
+          platforms: amd64,arm64
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -90,6 +93,7 @@ jobs:
             BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
             VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: ghcr.io/${{ github.repository_owner }}/malcolm/file-upload:${{ steps.extract_branch.outputs.branch }}
       -
         name: Run Trivy vulnerability scanner

diff --git a/.github/workflows/filebeat-build-and-push-ghcr.yml b/.github/workflows/filebeat-build-and-push-ghcr.yml
@@ -65,7 +65,10 @@ jobs:
         id: extract_malcolm_version
       -
         name: Set up QEMU
+        id: setup-qemu
         uses: docker/setup-qemu-action@v3
+        with:
+          platforms: amd64,arm64
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -90,6 +93,7 @@ jobs:
             BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
             VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: ghcr.io/${{ github.repository_owner }}/malcolm/filebeat-oss:${{ steps.extract_branch.outputs.branch }}
       -
         name: Run Trivy vulnerability scanner

diff --git a/.github/workflows/freq-build-and-push-ghcr.yml b/.github/workflows/freq-build-and-push-ghcr.yml
@@ -65,7 +65,10 @@ jobs:
         id: extract_malcolm_version
       -
         name: Set up QEMU
+        id: setup-qemu
         uses: docker/setup-qemu-action@v3
+        with:
+          platforms: amd64,arm64
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -90,6 +93,7 @@ jobs:
             BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
             VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: ghcr.io/${{ github.repository_owner }}/malcolm/freq:${{ steps.extract_branch.outputs.branch }}
       -
         name: Run Trivy vulnerability scanner

diff --git a/.github/workflows/htadmin-build-and-push-ghcr.yml b/.github/workflows/htadmin-build-and-push-ghcr.yml
@@ -65,7 +65,10 @@ jobs:
         id: extract_malcolm_version
       -
         name: Set up QEMU
+        id: setup-qemu
         uses: docker/setup-qemu-action@v3
+        with:
+          platforms: amd64,arm64
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -90,6 +93,7 @@ jobs:
             BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
             VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: ghcr.io/${{ github.repository_owner }}/malcolm/htadmin:${{ steps.extract_branch.outputs.branch }}
       -
         name: Run Trivy vulnerability scanner

diff --git a/.github/workflows/logstash-build-and-push-ghcr.yml b/.github/workflows/logstash-build-and-push-ghcr.yml
@@ -65,7 +65,10 @@ jobs:
         id: extract_malcolm_version
       -
         name: Set up QEMU
+        id: setup-qemu
         uses: docker/setup-qemu-action@v3
+        with:
+          platforms: amd64,arm64
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -90,6 +93,7 @@ jobs:
             BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
             VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: ghcr.io/${{ github.repository_owner }}/malcolm/logstash-oss:${{ steps.extract_branch.outputs.branch }}
       -
         name: Run Trivy vulnerability scanner

diff --git a/.github/workflows/netbox-build-and-push-ghcr.yml b/.github/workflows/netbox-build-and-push-ghcr.yml
@@ -65,7 +65,10 @@ jobs:
         id: extract_malcolm_version
       -
         name: Set up QEMU
+        id: setup-qemu
         uses: docker/setup-qemu-action@v3
+        with:
+          platforms: amd64,arm64
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -90,6 +93,7 @@ jobs:
             BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
             VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: ghcr.io/${{ github.repository_owner }}/malcolm/netbox:${{ steps.extract_branch.outputs.branch }}
       -
         name: Run Trivy vulnerability scanner

diff --git a/.github/workflows/nginx-build-and-push-ghcr.yml b/.github/workflows/nginx-build-and-push-ghcr.yml
@@ -71,7 +71,10 @@ jobs:
         id: extract_malcolm_version
       -
         name: Set up QEMU
+        id: setup-qemu
         uses: docker/setup-qemu-action@v3
+        with:
+          platforms: amd64,arm64
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -97,6 +100,7 @@ jobs:
             VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}
             GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: ghcr.io/${{ github.repository_owner }}/malcolm/nginx-proxy:${{ steps.extract_branch.outputs.branch }}
       -
         name: Run Trivy vulnerability scanner

diff --git a/.github/workflows/opensearch-build-and-push-ghcr.yml b/.github/workflows/opensearch-build-and-push-ghcr.yml
@@ -64,7 +64,10 @@ jobs:
         id: extract_malcolm_version
       -
         name: Set up QEMU
+        id: setup-qemu
         uses: docker/setup-qemu-action@v3
+        with:
+          platforms: amd64,arm64
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -89,6 +92,7 @@ jobs:
             BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
             VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: ghcr.io/${{ github.repository_owner }}/malcolm/opensearch:${{ steps.extract_branch.outputs.branch }}
       -
         name: Run Trivy vulnerability scanner

diff --git a/.github/workflows/pcap-capture-build-and-push-ghcr.yml b/.github/workflows/pcap-capture-build-and-push-ghcr.yml
@@ -65,7 +65,10 @@ jobs:
         id: extract_malcolm_version
       -
         name: Set up QEMU
+        id: setup-qemu
         uses: docker/setup-qemu-action@v3
+        with:
+          platforms: amd64,arm64
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -90,6 +93,7 @@ jobs:
             BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
             VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: ghcr.io/${{ github.repository_owner }}/malcolm/pcap-capture:${{ steps.extract_branch.outputs.branch }}
       -
         name: Run Trivy vulnerability scanner

diff --git a/.github/workflows/pcap-monitor-build-and-push-ghcr.yml b/.github/workflows/pcap-monitor-build-and-push-ghcr.yml
@@ -65,7 +65,10 @@ jobs:
         id: extract_malcolm_version
       -
         name: Set up QEMU
+        id: setup-qemu
         uses: docker/setup-qemu-action@v3
+        with:
+          platforms: amd64,arm64
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -90,6 +93,7 @@ jobs:
             BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
             VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: ghcr.io/${{ github.repository_owner }}/malcolm/pcap-monitor:${{ steps.extract_branch.outputs.branch }}
       -
         name: Run Trivy vulnerability scanner

diff --git a/.github/workflows/postgresql-build-and-push-ghcr.yml b/.github/workflows/postgresql-build-and-push-ghcr.yml
@@ -64,7 +64,10 @@ jobs:
         id: extract_malcolm_version
       -
         name: Set up QEMU
+        id: setup-qemu
         uses: docker/setup-qemu-action@v3
+        with:
+          platforms: amd64,arm64
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -89,6 +92,7 @@ jobs:
             BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
             VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: ghcr.io/${{ github.repository_owner }}/malcolm/postgresql:${{ steps.extract_branch.outputs.branch }}
       -
         name: Run Trivy vulnerability scanner

diff --git a/.github/workflows/redis-build-and-push-ghcr.yml b/.github/workflows/redis-build-and-push-ghcr.yml
@@ -64,7 +64,10 @@ jobs:
         id: extract_malcolm_version
       -
         name: Set up QEMU
+        id: setup-qemu
         uses: docker/setup-qemu-action@v3
+        with:
+          platforms: amd64,arm64
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -89,6 +92,7 @@ jobs:
             BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
             VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: ghcr.io/${{ github.repository_owner }}/malcolm/redis:${{ steps.extract_branch.outputs.branch }}
       -
         name: Run Trivy vulnerability scanner

diff --git a/.github/workflows/suricata-build-and-push-ghcr.yml b/.github/workflows/suricata-build-and-push-ghcr.yml
@@ -64,7 +64,10 @@ jobs:
         id: extract_malcolm_version
       -
         name: Set up QEMU
+        id: setup-qemu
         uses: docker/setup-qemu-action@v3
+        with:
+          platforms: amd64,arm64
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -89,6 +92,7 @@ jobs:
             BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
             VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: ghcr.io/${{ github.repository_owner }}/malcolm/suricata:${{ steps.extract_branch.outputs.branch }}
       -
         name: Run Trivy vulnerability scanner

diff --git a/.github/workflows/zeek-build-and-push-ghcr.yml b/.github/workflows/zeek-build-and-push-ghcr.yml
@@ -64,7 +64,10 @@ jobs:
         id: extract_malcolm_version
       -
         name: Set up QEMU
+        id: setup-qemu
         uses: docker/setup-qemu-action@v3
+        with:
+          platforms: amd64,arm64
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -90,6 +93,7 @@ jobs:
             BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
             VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: ghcr.io/${{ github.repository_owner }}/malcolm/zeek:${{ steps.extract_branch.outputs.branch }}
       -
         name: Run Trivy vulnerability scanner