From 4da7791173aa9ce81c6221cfd862c16e25aa31e3 Mon Sep 17 00:00:00 2001 From: Seth Grover Date: Mon, 3 Feb 2025 12:53:55 -0700 Subject: [PATCH] cisagov/Malcolm#557, use arm-hosted runners for github build actions --- .github/workflows/api-build-and-push-ghcr.yml | 20 ++++++------ .../workflows/arkime-build-and-push-ghcr.yml | 20 ++++++------ .../dashboards-build-and-push-ghcr.yml | 20 ++++++------ .../dashboards-helper-build-and-push-ghcr.yml | 20 ++++++------ .../file-monitor-build-and-push-ghcr.yml | 20 ++++++------ .../file-upload-build-and-push-ghcr.yml | 20 ++++++------ .../filebeat-build-and-push-ghcr.yml | 20 ++++++------ .../workflows/freq-build-and-push-ghcr.yml | 20 ++++++------ ...dgehog-iso-build-docker-wrap-push-ghcr.yml | 14 +++++--- ...ehog-raspi-build-docker-wrap-push-ghcr.yml | 32 ++++++++++++------- .../workflows/htadmin-build-and-push-ghcr.yml | 20 ++++++------ .../logstash-build-and-push-ghcr.yml | 20 ++++++------ ...alcolm-iso-build-docker-wrap-push-ghcr.yml | 14 +++++--- .../workflows/netbox-build-and-push-ghcr.yml | 20 ++++++------ .../workflows/nginx-build-and-push-ghcr.yml | 20 ++++++------ .../opensearch-build-and-push-ghcr.yml | 20 ++++++------ .../pcap-capture-build-and-push-ghcr.yml | 20 ++++++------ .../pcap-monitor-build-and-push-ghcr.yml | 20 ++++++------ .../postgresql-build-and-push-ghcr.yml | 20 ++++++------ .../workflows/redis-build-and-push-ghcr.yml | 20 ++++++------ .../suricata-build-and-push-ghcr.yml | 20 ++++++------ .../workflows/zeek-build-and-push-ghcr.yml | 20 ++++++------ 22 files changed, 209 insertions(+), 231 deletions(-) diff --git a/.github/workflows/api-build-and-push-ghcr.yml b/.github/workflows/api-build-and-push-ghcr.yml index d814c102c..a5af880bb 100644 --- a/.github/workflows/api-build-and-push-ghcr.yml +++ b/.github/workflows/api-build-and-push-ghcr.yml @@ -25,7 +25,7 @@ on: jobs: docker: - runs-on: ubuntu-22.04 + runs-on: ${{ matrix.os }} permissions: actions: write packages: write @@ -34,9 +34,13 @@ jobs: strategy: fail-fast: false matrix: - platform: - - linux/amd64 - - linux/arm64 + include: + - os: ubuntu-24.04 + arch: amd64 + platform: linux/amd64 + - os: ubuntu-24.04-arm + arch: arm64 + platform: linux/arm64 steps: - name: Cancel previous run in progress @@ -73,12 +77,6 @@ jobs: shell: bash run: echo "mversion=$(grep -P "^\s+image:.*/malcolm/" docker-compose-dev.yml | awk '{print $2}' | cut -d':' -f2 | uniq -c | sort -nr | awk '{print $2}' | head -n 1)" >> $GITHUB_OUTPUT id: extract_malcolm_version - - - name: Set up QEMU - id: setup-qemu - uses: docker/setup-qemu-action@v3 - with: - platforms: ${{ matrix.platform }} - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -94,7 +92,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . file: ./Dockerfiles/api.Dockerfile diff --git a/.github/workflows/arkime-build-and-push-ghcr.yml b/.github/workflows/arkime-build-and-push-ghcr.yml index cac2b238c..711bb1509 100644 --- a/.github/workflows/arkime-build-and-push-ghcr.yml +++ b/.github/workflows/arkime-build-and-push-ghcr.yml @@ -25,7 +25,7 @@ on: jobs: docker: - runs-on: ubuntu-22.04 + runs-on: ${{ matrix.os }} permissions: actions: write packages: write @@ -34,9 +34,13 @@ jobs: strategy: fail-fast: false matrix: - platform: - - linux/amd64 - - linux/arm64 + include: + - os: ubuntu-24.04 + arch: amd64 + platform: linux/amd64 + - os: ubuntu-24.04-arm + arch: arm64 + platform: linux/arm64 steps: - name: Cancel previous run in progress @@ -73,12 +77,6 @@ jobs: shell: bash run: echo "mversion=$(grep -P "^\s+image:.*/malcolm/" docker-compose-dev.yml | awk '{print $2}' | cut -d':' -f2 | uniq -c | sort -nr | awk '{print $2}' | head -n 1)" >> $GITHUB_OUTPUT id: extract_malcolm_version - - - name: Set up QEMU - id: setup-qemu - uses: docker/setup-qemu-action@v3 - with: - platforms: ${{ matrix.platform }} - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -94,7 +92,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . file: ./Dockerfiles/arkime.Dockerfile diff --git a/.github/workflows/dashboards-build-and-push-ghcr.yml b/.github/workflows/dashboards-build-and-push-ghcr.yml index 814d14bea..3c5591bc1 100644 --- a/.github/workflows/dashboards-build-and-push-ghcr.yml +++ b/.github/workflows/dashboards-build-and-push-ghcr.yml @@ -25,7 +25,7 @@ on: jobs: docker: - runs-on: ubuntu-22.04 + runs-on: ${{ matrix.os }} permissions: actions: write packages: write @@ -34,9 +34,13 @@ jobs: strategy: fail-fast: false matrix: - platform: - - linux/amd64 - - linux/arm64 + include: + - os: ubuntu-24.04 + arch: amd64 + platform: linux/amd64 + - os: ubuntu-24.04-arm + arch: arm64 + platform: linux/arm64 steps: - name: Cancel previous run in progress @@ -73,12 +77,6 @@ jobs: shell: bash run: echo "mversion=$(grep -P "^\s+image:.*/malcolm/" docker-compose-dev.yml | awk '{print $2}' | cut -d':' -f2 | uniq -c | sort -nr | awk '{print $2}' | head -n 1)" >> $GITHUB_OUTPUT id: extract_malcolm_version - - - name: Set up QEMU - id: setup-qemu - uses: docker/setup-qemu-action@v3 - with: - platforms: ${{ matrix.platform }} - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -94,7 +92,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . file: ./Dockerfiles/dashboards.Dockerfile diff --git a/.github/workflows/dashboards-helper-build-and-push-ghcr.yml b/.github/workflows/dashboards-helper-build-and-push-ghcr.yml index 68c7cf5de..46a1c88e9 100644 --- a/.github/workflows/dashboards-helper-build-and-push-ghcr.yml +++ b/.github/workflows/dashboards-helper-build-and-push-ghcr.yml @@ -25,7 +25,7 @@ on: jobs: docker: - runs-on: ubuntu-22.04 + runs-on: ${{ matrix.os }} permissions: actions: write packages: write @@ -34,9 +34,13 @@ jobs: strategy: fail-fast: false matrix: - platform: - - linux/amd64 - - linux/arm64 + include: + - os: ubuntu-24.04 + arch: amd64 + platform: linux/amd64 + - os: ubuntu-24.04-arm + arch: arm64 + platform: linux/arm64 steps: - name: Cancel previous run in progress @@ -73,12 +77,6 @@ jobs: shell: bash run: echo "mversion=$(grep -P "^\s+image:.*/malcolm/" docker-compose-dev.yml | awk '{print $2}' | cut -d':' -f2 | uniq -c | sort -nr | awk '{print $2}' | head -n 1)" >> $GITHUB_OUTPUT id: extract_malcolm_version - - - name: Set up QEMU - id: setup-qemu - uses: docker/setup-qemu-action@v3 - with: - platforms: ${{ matrix.platform }} - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -94,7 +92,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . file: ./Dockerfiles/dashboards-helper.Dockerfile diff --git a/.github/workflows/file-monitor-build-and-push-ghcr.yml b/.github/workflows/file-monitor-build-and-push-ghcr.yml index 4a5b5d23b..61bde1b09 100644 --- a/.github/workflows/file-monitor-build-and-push-ghcr.yml +++ b/.github/workflows/file-monitor-build-and-push-ghcr.yml @@ -22,7 +22,7 @@ on: jobs: docker: - runs-on: ubuntu-22.04 + runs-on: ${{ matrix.os }} permissions: actions: write packages: write @@ -31,9 +31,13 @@ jobs: strategy: fail-fast: false matrix: - platform: - - linux/amd64 - - linux/arm64 + include: + - os: ubuntu-24.04 + arch: amd64 + platform: linux/amd64 + - os: ubuntu-24.04-arm + arch: arm64 + platform: linux/arm64 steps: - name: Cancel previous run in progress @@ -70,12 +74,6 @@ jobs: shell: bash run: echo "mversion=$(grep -P "^\s+image:.*/malcolm/" docker-compose-dev.yml | awk '{print $2}' | cut -d':' -f2 | uniq -c | sort -nr | awk '{print $2}' | head -n 1)" >> $GITHUB_OUTPUT id: extract_malcolm_version - - - name: Set up QEMU - id: setup-qemu - uses: docker/setup-qemu-action@v3 - with: - platforms: ${{ matrix.platform }} - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -91,7 +89,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . file: ./Dockerfiles/file-monitor.Dockerfile diff --git a/.github/workflows/file-upload-build-and-push-ghcr.yml b/.github/workflows/file-upload-build-and-push-ghcr.yml index 8bfb0a3b5..abe9bc85a 100644 --- a/.github/workflows/file-upload-build-and-push-ghcr.yml +++ b/.github/workflows/file-upload-build-and-push-ghcr.yml @@ -25,7 +25,7 @@ on: jobs: docker: - runs-on: ubuntu-22.04 + runs-on: ${{ matrix.os }} permissions: actions: write packages: write @@ -34,9 +34,13 @@ jobs: strategy: fail-fast: false matrix: - platform: - - linux/amd64 - - linux/arm64 + include: + - os: ubuntu-24.04 + arch: amd64 + platform: linux/amd64 + - os: ubuntu-24.04-arm + arch: arm64 + platform: linux/arm64 steps: - name: Cancel previous run in progress @@ -73,12 +77,6 @@ jobs: shell: bash run: echo "mversion=$(grep -P "^\s+image:.*/malcolm/" docker-compose-dev.yml | awk '{print $2}' | cut -d':' -f2 | uniq -c | sort -nr | awk '{print $2}' | head -n 1)" >> $GITHUB_OUTPUT id: extract_malcolm_version - - - name: Set up QEMU - id: setup-qemu - uses: docker/setup-qemu-action@v3 - with: - platforms: ${{ matrix.platform }} - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -94,7 +92,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . file: ./Dockerfiles/file-upload.Dockerfile diff --git a/.github/workflows/filebeat-build-and-push-ghcr.yml b/.github/workflows/filebeat-build-and-push-ghcr.yml index 7b66e8187..a34846dab 100644 --- a/.github/workflows/filebeat-build-and-push-ghcr.yml +++ b/.github/workflows/filebeat-build-and-push-ghcr.yml @@ -25,7 +25,7 @@ on: jobs: docker: - runs-on: ubuntu-22.04 + runs-on: ${{ matrix.os }} permissions: actions: write packages: write @@ -34,9 +34,13 @@ jobs: strategy: fail-fast: false matrix: - platform: - - linux/amd64 - - linux/arm64 + include: + - os: ubuntu-24.04 + arch: amd64 + platform: linux/amd64 + - os: ubuntu-24.04-arm + arch: arm64 + platform: linux/arm64 steps: - name: Cancel previous run in progress @@ -73,12 +77,6 @@ jobs: shell: bash run: echo "mversion=$(grep -P "^\s+image:.*/malcolm/" docker-compose-dev.yml | awk '{print $2}' | cut -d':' -f2 | uniq -c | sort -nr | awk '{print $2}' | head -n 1)" >> $GITHUB_OUTPUT id: extract_malcolm_version - - - name: Set up QEMU - id: setup-qemu - uses: docker/setup-qemu-action@v3 - with: - platforms: ${{ matrix.platform }} - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -94,7 +92,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . file: ./Dockerfiles/filebeat.Dockerfile diff --git a/.github/workflows/freq-build-and-push-ghcr.yml b/.github/workflows/freq-build-and-push-ghcr.yml index 7ee2a5ece..224184042 100644 --- a/.github/workflows/freq-build-and-push-ghcr.yml +++ b/.github/workflows/freq-build-and-push-ghcr.yml @@ -25,7 +25,7 @@ on: jobs: docker: - runs-on: ubuntu-22.04 + runs-on: ${{ matrix.os }} permissions: actions: write packages: write @@ -34,9 +34,13 @@ jobs: strategy: fail-fast: false matrix: - platform: - - linux/amd64 - - linux/arm64 + include: + - os: ubuntu-24.04 + arch: amd64 + platform: linux/amd64 + - os: ubuntu-24.04-arm + arch: arm64 + platform: linux/arm64 steps: - name: Cancel previous run in progress @@ -73,12 +77,6 @@ jobs: shell: bash run: echo "mversion=$(grep -P "^\s+image:.*/malcolm/" docker-compose-dev.yml | awk '{print $2}' | cut -d':' -f2 | uniq -c | sort -nr | awk '{print $2}' | head -n 1)" >> $GITHUB_OUTPUT id: extract_malcolm_version - - - name: Set up QEMU - id: setup-qemu - uses: docker/setup-qemu-action@v3 - with: - platforms: ${{ matrix.platform }} - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -94,7 +92,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . file: ./Dockerfiles/freq.Dockerfile diff --git a/.github/workflows/hedgehog-iso-build-docker-wrap-push-ghcr.yml b/.github/workflows/hedgehog-iso-build-docker-wrap-push-ghcr.yml index 404e737f7..a5a9e1708 100644 --- a/.github/workflows/hedgehog-iso-build-docker-wrap-push-ghcr.yml +++ b/.github/workflows/hedgehog-iso-build-docker-wrap-push-ghcr.yml @@ -15,12 +15,19 @@ on: jobs: build: - runs-on: ubuntu-22.04 + runs-on: ${{ matrix.os }} permissions: actions: write packages: write contents: read security-events: write + strategy: + fail-fast: false + matrix: + include: + - os: ubuntu-24.04 + arch: amd64 + platform: linux/amd64 defaults: run: shell: bash @@ -32,9 +39,6 @@ jobs: ignore_sha: true all_but_latest: true access_token: ${{ secrets.GITHUB_TOKEN }} - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -169,7 +173,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push ISO image - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: ./hedgehog-iso push: true diff --git a/.github/workflows/hedgehog-raspi-build-docker-wrap-push-ghcr.yml b/.github/workflows/hedgehog-raspi-build-docker-wrap-push-ghcr.yml index 21c46dbfd..915be73d5 100644 --- a/.github/workflows/hedgehog-raspi-build-docker-wrap-push-ghcr.yml +++ b/.github/workflows/hedgehog-raspi-build-docker-wrap-push-ghcr.yml @@ -1,23 +1,34 @@ name: hedgehog-raspi-build-docker-wrap-push-ghcr on: - # push: - # branches: - # - main - # - development - # paths: - # - '.trigger_raspi_workflow_build' + push: + branches: + - main + - development + paths: + - 'hedgehog-iso/**' + - 'hedgehog-raspi/**' + - 'shared/bin/*' + - '.trigger_raspi_workflow_build' + - '.github/workflows/hedgehog-raspi-build-docker-wrap-push-ghcr.yml' workflow_dispatch: - # repository_dispatch: + repository_dispatch: jobs: build: - runs-on: ubuntu-22.04 + runs-on: ${{ matrix.os }} permissions: actions: write packages: write contents: read security-events: write + strategy: + fail-fast: true + matrix: + include: + - os: ubuntu-24.04-arm + arch: arm64 + platform: linux/arm64 defaults: run: shell: bash @@ -29,9 +40,6 @@ jobs: ignore_sha: true all_but_latest: true access_token: ${{ secrets.GITHUB_TOKEN }} - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -102,7 +110,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push IMG image - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: ./hedgehog-raspi push: true diff --git a/.github/workflows/htadmin-build-and-push-ghcr.yml b/.github/workflows/htadmin-build-and-push-ghcr.yml index a2f1b89ed..9ccea0e9c 100644 --- a/.github/workflows/htadmin-build-and-push-ghcr.yml +++ b/.github/workflows/htadmin-build-and-push-ghcr.yml @@ -25,7 +25,7 @@ on: jobs: docker: - runs-on: ubuntu-22.04 + runs-on: ${{ matrix.os }} permissions: actions: write packages: write @@ -34,9 +34,13 @@ jobs: strategy: fail-fast: false matrix: - platform: - - linux/amd64 - - linux/arm64 + include: + - os: ubuntu-24.04 + arch: amd64 + platform: linux/amd64 + - os: ubuntu-24.04-arm + arch: arm64 + platform: linux/arm64 steps: - name: Cancel previous run in progress @@ -73,12 +77,6 @@ jobs: shell: bash run: echo "mversion=$(grep -P "^\s+image:.*/malcolm/" docker-compose-dev.yml | awk '{print $2}' | cut -d':' -f2 | uniq -c | sort -nr | awk '{print $2}' | head -n 1)" >> $GITHUB_OUTPUT id: extract_malcolm_version - - - name: Set up QEMU - id: setup-qemu - uses: docker/setup-qemu-action@v3 - with: - platforms: ${{ matrix.platform }} - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -94,7 +92,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . file: ./Dockerfiles/htadmin.Dockerfile diff --git a/.github/workflows/logstash-build-and-push-ghcr.yml b/.github/workflows/logstash-build-and-push-ghcr.yml index 491f92539..eed05a473 100644 --- a/.github/workflows/logstash-build-and-push-ghcr.yml +++ b/.github/workflows/logstash-build-and-push-ghcr.yml @@ -25,7 +25,7 @@ on: jobs: docker: - runs-on: ubuntu-22.04 + runs-on: ${{ matrix.os }} permissions: actions: write packages: write @@ -34,9 +34,13 @@ jobs: strategy: fail-fast: false matrix: - platform: - - linux/amd64 - - linux/arm64 + include: + - os: ubuntu-24.04 + arch: amd64 + platform: linux/amd64 + - os: ubuntu-24.04-arm + arch: arm64 + platform: linux/arm64 steps: - name: Cancel previous run in progress @@ -73,12 +77,6 @@ jobs: shell: bash run: echo "mversion=$(grep -P "^\s+image:.*/malcolm/" docker-compose-dev.yml | awk '{print $2}' | cut -d':' -f2 | uniq -c | sort -nr | awk '{print $2}' | head -n 1)" >> $GITHUB_OUTPUT id: extract_malcolm_version - - - name: Set up QEMU - id: setup-qemu - uses: docker/setup-qemu-action@v3 - with: - platforms: ${{ matrix.platform }} - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -94,7 +92,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . file: ./Dockerfiles/logstash.Dockerfile diff --git a/.github/workflows/malcolm-iso-build-docker-wrap-push-ghcr.yml b/.github/workflows/malcolm-iso-build-docker-wrap-push-ghcr.yml index 6c243aff2..aea43dbfc 100644 --- a/.github/workflows/malcolm-iso-build-docker-wrap-push-ghcr.yml +++ b/.github/workflows/malcolm-iso-build-docker-wrap-push-ghcr.yml @@ -20,12 +20,19 @@ on: jobs: build: - runs-on: ubuntu-22.04 + runs-on: ${{ matrix.os }} permissions: actions: write packages: write contents: read security-events: write + strategy: + fail-fast: false + matrix: + include: + - os: ubuntu-24.04 + arch: amd64 + platform: linux/amd64 defaults: run: shell: bash @@ -37,9 +44,6 @@ jobs: ignore_sha: true all_but_latest: true access_token: ${{ secrets.GITHUB_TOKEN }} - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -175,7 +179,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push ISO image - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: ./malcolm-iso push: true diff --git a/.github/workflows/netbox-build-and-push-ghcr.yml b/.github/workflows/netbox-build-and-push-ghcr.yml index 9f55a2c88..634a2e1c1 100644 --- a/.github/workflows/netbox-build-and-push-ghcr.yml +++ b/.github/workflows/netbox-build-and-push-ghcr.yml @@ -25,7 +25,7 @@ on: jobs: docker: - runs-on: ubuntu-22.04 + runs-on: ${{ matrix.os }} permissions: actions: write packages: write @@ -34,9 +34,13 @@ jobs: strategy: fail-fast: false matrix: - platform: - - linux/amd64 - - linux/arm64 + include: + - os: ubuntu-24.04 + arch: amd64 + platform: linux/amd64 + - os: ubuntu-24.04-arm + arch: arm64 + platform: linux/arm64 steps: - name: Cancel previous run in progress @@ -73,12 +77,6 @@ jobs: shell: bash run: echo "mversion=$(grep -P "^\s+image:.*/malcolm/" docker-compose-dev.yml | awk '{print $2}' | cut -d':' -f2 | uniq -c | sort -nr | awk '{print $2}' | head -n 1)" >> $GITHUB_OUTPUT id: extract_malcolm_version - - - name: Set up QEMU - id: setup-qemu - uses: docker/setup-qemu-action@v3 - with: - platforms: ${{ matrix.platform }} - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -94,7 +92,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . file: ./Dockerfiles/netbox.Dockerfile diff --git a/.github/workflows/nginx-build-and-push-ghcr.yml b/.github/workflows/nginx-build-and-push-ghcr.yml index 8884bed08..3a1e748ed 100644 --- a/.github/workflows/nginx-build-and-push-ghcr.yml +++ b/.github/workflows/nginx-build-and-push-ghcr.yml @@ -31,7 +31,7 @@ on: jobs: docker: - runs-on: ubuntu-22.04 + runs-on: ${{ matrix.os }} permissions: actions: write packages: write @@ -40,9 +40,13 @@ jobs: strategy: fail-fast: false matrix: - platform: - - linux/amd64 - - linux/arm64 + include: + - os: ubuntu-24.04 + arch: amd64 + platform: linux/amd64 + - os: ubuntu-24.04-arm + arch: arm64 + platform: linux/arm64 steps: - name: Cancel previous run in progress @@ -79,12 +83,6 @@ jobs: shell: bash run: echo "mversion=$(grep -P "^\s+image:.*/malcolm/" docker-compose-dev.yml | awk '{print $2}' | cut -d':' -f2 | uniq -c | sort -nr | awk '{print $2}' | head -n 1)" >> $GITHUB_OUTPUT id: extract_malcolm_version - - - name: Set up QEMU - id: setup-qemu - uses: docker/setup-qemu-action@v3 - with: - platforms: ${{ matrix.platform }} - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -100,7 +98,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . file: ./Dockerfiles/nginx.Dockerfile diff --git a/.github/workflows/opensearch-build-and-push-ghcr.yml b/.github/workflows/opensearch-build-and-push-ghcr.yml index 516f2feb6..c9e091523 100644 --- a/.github/workflows/opensearch-build-and-push-ghcr.yml +++ b/.github/workflows/opensearch-build-and-push-ghcr.yml @@ -24,7 +24,7 @@ on: jobs: docker: - runs-on: ubuntu-22.04 + runs-on: ${{ matrix.os }} permissions: actions: write packages: write @@ -33,9 +33,13 @@ jobs: strategy: fail-fast: false matrix: - platform: - - linux/amd64 - - linux/arm64 + include: + - os: ubuntu-24.04 + arch: amd64 + platform: linux/amd64 + - os: ubuntu-24.04-arm + arch: arm64 + platform: linux/arm64 steps: - name: Cancel previous run in progress @@ -72,12 +76,6 @@ jobs: shell: bash run: echo "mversion=$(grep -P "^\s+image:.*/malcolm/" docker-compose-dev.yml | awk '{print $2}' | cut -d':' -f2 | uniq -c | sort -nr | awk '{print $2}' | head -n 1)" >> $GITHUB_OUTPUT id: extract_malcolm_version - - - name: Set up QEMU - id: setup-qemu - uses: docker/setup-qemu-action@v3 - with: - platforms: ${{ matrix.platform }} - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -93,7 +91,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . file: ./Dockerfiles/opensearch.Dockerfile diff --git a/.github/workflows/pcap-capture-build-and-push-ghcr.yml b/.github/workflows/pcap-capture-build-and-push-ghcr.yml index a99ecb252..a018bb559 100644 --- a/.github/workflows/pcap-capture-build-and-push-ghcr.yml +++ b/.github/workflows/pcap-capture-build-and-push-ghcr.yml @@ -25,7 +25,7 @@ on: jobs: docker: - runs-on: ubuntu-22.04 + runs-on: ${{ matrix.os }} permissions: actions: write packages: write @@ -34,9 +34,13 @@ jobs: strategy: fail-fast: false matrix: - platform: - - linux/amd64 - - linux/arm64 + include: + - os: ubuntu-24.04 + arch: amd64 + platform: linux/amd64 + - os: ubuntu-24.04-arm + arch: arm64 + platform: linux/arm64 steps: - name: Cancel previous run in progress @@ -73,12 +77,6 @@ jobs: shell: bash run: echo "mversion=$(grep -P "^\s+image:.*/malcolm/" docker-compose-dev.yml | awk '{print $2}' | cut -d':' -f2 | uniq -c | sort -nr | awk '{print $2}' | head -n 1)" >> $GITHUB_OUTPUT id: extract_malcolm_version - - - name: Set up QEMU - id: setup-qemu - uses: docker/setup-qemu-action@v3 - with: - platforms: ${{ matrix.platform }} - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -94,7 +92,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . file: ./Dockerfiles/pcap-capture.Dockerfile diff --git a/.github/workflows/pcap-monitor-build-and-push-ghcr.yml b/.github/workflows/pcap-monitor-build-and-push-ghcr.yml index 3045364d0..d193a4f46 100644 --- a/.github/workflows/pcap-monitor-build-and-push-ghcr.yml +++ b/.github/workflows/pcap-monitor-build-and-push-ghcr.yml @@ -25,7 +25,7 @@ on: jobs: docker: - runs-on: ubuntu-22.04 + runs-on: ${{ matrix.os }} permissions: actions: write packages: write @@ -34,9 +34,13 @@ jobs: strategy: fail-fast: false matrix: - platform: - - linux/amd64 - - linux/arm64 + include: + - os: ubuntu-24.04 + arch: amd64 + platform: linux/amd64 + - os: ubuntu-24.04-arm + arch: arm64 + platform: linux/arm64 steps: - name: Cancel previous run in progress @@ -73,12 +77,6 @@ jobs: shell: bash run: echo "mversion=$(grep -P "^\s+image:.*/malcolm/" docker-compose-dev.yml | awk '{print $2}' | cut -d':' -f2 | uniq -c | sort -nr | awk '{print $2}' | head -n 1)" >> $GITHUB_OUTPUT id: extract_malcolm_version - - - name: Set up QEMU - id: setup-qemu - uses: docker/setup-qemu-action@v3 - with: - platforms: ${{ matrix.platform }} - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -94,7 +92,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . file: ./Dockerfiles/pcap-monitor.Dockerfile diff --git a/.github/workflows/postgresql-build-and-push-ghcr.yml b/.github/workflows/postgresql-build-and-push-ghcr.yml index 4c7cc3cbf..4a0b2121e 100644 --- a/.github/workflows/postgresql-build-and-push-ghcr.yml +++ b/.github/workflows/postgresql-build-and-push-ghcr.yml @@ -24,7 +24,7 @@ on: jobs: docker: - runs-on: ubuntu-22.04 + runs-on: ${{ matrix.os }} permissions: actions: write packages: write @@ -33,9 +33,13 @@ jobs: strategy: fail-fast: false matrix: - platform: - - linux/amd64 - - linux/arm64 + include: + - os: ubuntu-24.04 + arch: amd64 + platform: linux/amd64 + - os: ubuntu-24.04-arm + arch: arm64 + platform: linux/arm64 steps: - name: Cancel previous run in progress @@ -72,12 +76,6 @@ jobs: shell: bash run: echo "mversion=$(grep -P "^\s+image:.*/malcolm/" docker-compose-dev.yml | awk '{print $2}' | cut -d':' -f2 | uniq -c | sort -nr | awk '{print $2}' | head -n 1)" >> $GITHUB_OUTPUT id: extract_malcolm_version - - - name: Set up QEMU - id: setup-qemu - uses: docker/setup-qemu-action@v3 - with: - platforms: ${{ matrix.platform }} - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -93,7 +91,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . file: ./Dockerfiles/postgresql.Dockerfile diff --git a/.github/workflows/redis-build-and-push-ghcr.yml b/.github/workflows/redis-build-and-push-ghcr.yml index 9fb4b15ef..3a6049599 100644 --- a/.github/workflows/redis-build-and-push-ghcr.yml +++ b/.github/workflows/redis-build-and-push-ghcr.yml @@ -24,7 +24,7 @@ on: jobs: docker: - runs-on: ubuntu-22.04 + runs-on: ${{ matrix.os }} permissions: actions: write packages: write @@ -33,9 +33,13 @@ jobs: strategy: fail-fast: false matrix: - platform: - - linux/amd64 - - linux/arm64 + include: + - os: ubuntu-24.04 + arch: amd64 + platform: linux/amd64 + - os: ubuntu-24.04-arm + arch: arm64 + platform: linux/arm64 steps: - name: Cancel previous run in progress @@ -72,12 +76,6 @@ jobs: shell: bash run: echo "mversion=$(grep -P "^\s+image:.*/malcolm/" docker-compose-dev.yml | awk '{print $2}' | cut -d':' -f2 | uniq -c | sort -nr | awk '{print $2}' | head -n 1)" >> $GITHUB_OUTPUT id: extract_malcolm_version - - - name: Set up QEMU - id: setup-qemu - uses: docker/setup-qemu-action@v3 - with: - platforms: ${{ matrix.platform }} - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -93,7 +91,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . file: ./Dockerfiles/redis.Dockerfile diff --git a/.github/workflows/suricata-build-and-push-ghcr.yml b/.github/workflows/suricata-build-and-push-ghcr.yml index 80cd81341..7ae6e20b7 100644 --- a/.github/workflows/suricata-build-and-push-ghcr.yml +++ b/.github/workflows/suricata-build-and-push-ghcr.yml @@ -24,7 +24,7 @@ on: jobs: docker: - runs-on: ubuntu-22.04 + runs-on: ${{ matrix.os }} permissions: actions: write packages: write @@ -33,9 +33,13 @@ jobs: strategy: fail-fast: false matrix: - platform: - - linux/amd64 - - linux/arm64 + include: + - os: ubuntu-24.04 + arch: amd64 + platform: linux/amd64 + - os: ubuntu-24.04-arm + arch: arm64 + platform: linux/arm64 steps: - name: Cancel previous run in progress @@ -72,12 +76,6 @@ jobs: shell: bash run: echo "mversion=$(grep -P "^\s+image:.*/malcolm/" docker-compose-dev.yml | awk '{print $2}' | cut -d':' -f2 | uniq -c | sort -nr | awk '{print $2}' | head -n 1)" >> $GITHUB_OUTPUT id: extract_malcolm_version - - - name: Set up QEMU - id: setup-qemu - uses: docker/setup-qemu-action@v3 - with: - platforms: ${{ matrix.platform }} - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -93,7 +91,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . file: ./Dockerfiles/suricata.Dockerfile diff --git a/.github/workflows/zeek-build-and-push-ghcr.yml b/.github/workflows/zeek-build-and-push-ghcr.yml index 4d86f3424..ab8c4ee71 100644 --- a/.github/workflows/zeek-build-and-push-ghcr.yml +++ b/.github/workflows/zeek-build-and-push-ghcr.yml @@ -24,7 +24,7 @@ on: jobs: docker: - runs-on: ubuntu-22.04 + runs-on: ${{ matrix.os }} permissions: actions: write packages: write @@ -33,9 +33,13 @@ jobs: strategy: fail-fast: false matrix: - platform: - - linux/amd64 - - linux/arm64 + include: + - os: ubuntu-24.04 + arch: amd64 + platform: linux/amd64 + - os: ubuntu-24.04-arm + arch: arm64 + platform: linux/arm64 steps: - name: Cancel previous run in progress @@ -72,12 +76,6 @@ jobs: shell: bash run: echo "mversion=$(grep -P "^\s+image:.*/malcolm/" docker-compose-dev.yml | awk '{print $2}' | cut -d':' -f2 | uniq -c | sort -nr | awk '{print $2}' | head -n 1)" >> $GITHUB_OUTPUT id: extract_malcolm_version - - - name: Set up QEMU - id: setup-qemu - uses: docker/setup-qemu-action@v3 - with: - platforms: ${{ matrix.platform }} - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -93,7 +91,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . file: ./Dockerfiles/zeek.Dockerfile