From ac82c26692bed07f05d108eda85ef982d5328d01 Mon Sep 17 00:00:00 2001
From: Seth Grover <seth.d.grover@gmail.com>
Date: Mon, 6 May 2024 17:05:00 -0600
Subject: [PATCH] for idaholab/Malcolm#389, enable arm64 platform for GitHub
 workflow builds

---
 .github/workflows/api-build-and-push-ghcr.yml               | 4 ++++
 .github/workflows/arkime-build-and-push-ghcr.yml            | 4 ++++
 .github/workflows/dashboards-build-and-push-ghcr.yml        | 4 ++++
 .github/workflows/dashboards-helper-build-and-push-ghcr.yml | 4 ++++
 .github/workflows/dirinit-build-and-push-ghcr.yml           | 4 ++++
 .github/workflows/file-monitor-build-and-push-ghcr.yml      | 4 ++++
 .github/workflows/file-upload-build-and-push-ghcr.yml       | 4 ++++
 .github/workflows/filebeat-build-and-push-ghcr.yml          | 4 ++++
 .github/workflows/freq-build-and-push-ghcr.yml              | 4 ++++
 .github/workflows/htadmin-build-and-push-ghcr.yml           | 4 ++++
 .github/workflows/logstash-build-and-push-ghcr.yml          | 4 ++++
 .github/workflows/netbox-build-and-push-ghcr.yml            | 4 ++++
 .github/workflows/nginx-build-and-push-ghcr.yml             | 4 ++++
 .github/workflows/opensearch-build-and-push-ghcr.yml        | 4 ++++
 .github/workflows/pcap-capture-build-and-push-ghcr.yml      | 4 ++++
 .github/workflows/pcap-monitor-build-and-push-ghcr.yml      | 4 ++++
 .github/workflows/postgresql-build-and-push-ghcr.yml        | 4 ++++
 .github/workflows/redis-build-and-push-ghcr.yml             | 4 ++++
 .github/workflows/suricata-build-and-push-ghcr.yml          | 4 ++++
 .github/workflows/zeek-build-and-push-ghcr.yml              | 4 ++++
 20 files changed, 80 insertions(+)

diff --git a/.github/workflows/api-build-and-push-ghcr.yml b/.github/workflows/api-build-and-push-ghcr.yml
index c3afef062..d37ac4391 100644
--- 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
index 6e29fe344..6f764101b 100644
--- 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
index 89a231969..dcdd99a77 100644
--- 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
index 3b37f288b..55d01894a 100644
--- 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
index 9abe1a7f4..9b855ab6f 100644
--- 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
index cd1452a25..2c1425bc9 100644
--- 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
index d49a4c764..d56ced0cd 100644
--- 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
index 22eda2753..26d424f30 100644
--- 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
index 460306157..22be6b770 100644
--- 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
index b42016a6c..2601f6732 100644
--- 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
index ab3245d02..3297a78cc 100644
--- 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
index 133f82735..cd004b6ca 100644
--- 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
index 654e6fdf6..944c760e6 100644
--- 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
index acfb82187..54bc9749e 100644
--- 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
index 190f89752..71796812a 100644
--- 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
index 62fdcce1f..5a2f10a2d 100644
--- 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
index 467a3396d..f6ee43c64 100644
--- 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
index 49373adac..402ac98c9 100644
--- 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
index eae9b387e..62ab0759c 100644
--- 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
index 1a64b28ab..ee9a4cfc1 100644
--- 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