diff --git a/.github/workflows/api-build-and-push-ghcr.yml b/.github/workflows/api-build-and-push-ghcr.yml index 879f1a358..fe98e3d73 100644 --- a/.github/workflows/api-build-and-push-ghcr.yml +++ b/.github/workflows/api-build-and-push-ghcr.yml @@ -123,7 +123,7 @@ jobs: tags: ghcr.io/${{ github.repository_owner }}/malcolm/api:${{ steps.extract_branch.outputs.branch }} - name: Run Trivy vulnerability scanner - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} id: trivy-scan uses: aquasecurity/trivy-action@master with: @@ -139,7 +139,7 @@ jobs: exit-code: '0' - name: Upload Trivy scan results to GitHub Security tab - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} uses: github/codeql-action/upload-sarif@v3 with: sarif_file: 'trivy-results.sarif' diff --git a/.github/workflows/arkime-build-and-push-ghcr.yml b/.github/workflows/arkime-build-and-push-ghcr.yml index 654bb8751..4a1f2626b 100644 --- a/.github/workflows/arkime-build-and-push-ghcr.yml +++ b/.github/workflows/arkime-build-and-push-ghcr.yml @@ -124,7 +124,7 @@ jobs: tags: ghcr.io/${{ github.repository_owner }}/malcolm/arkime:${{ steps.extract_branch.outputs.branch }} - name: Run Trivy vulnerability scanner - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} id: trivy-scan uses: aquasecurity/trivy-action@master with: @@ -140,7 +140,7 @@ jobs: exit-code: '0' - name: Upload Trivy scan results to GitHub Security tab - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} uses: github/codeql-action/upload-sarif@v3 with: sarif_file: 'trivy-results.sarif' diff --git a/.github/workflows/dashboards-build-and-push-ghcr.yml b/.github/workflows/dashboards-build-and-push-ghcr.yml index 6f4285c99..c68f7bcdc 100644 --- a/.github/workflows/dashboards-build-and-push-ghcr.yml +++ b/.github/workflows/dashboards-build-and-push-ghcr.yml @@ -123,7 +123,7 @@ jobs: tags: ghcr.io/${{ github.repository_owner }}/malcolm/dashboards:${{ steps.extract_branch.outputs.branch }} - name: Run Trivy vulnerability scanner - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} id: trivy-scan uses: aquasecurity/trivy-action@master with: @@ -139,7 +139,7 @@ jobs: exit-code: '0' - name: Upload Trivy scan results to GitHub Security tab - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} uses: github/codeql-action/upload-sarif@v3 with: sarif_file: 'trivy-results.sarif' diff --git a/.github/workflows/dashboards-helper-build-and-push-ghcr.yml b/.github/workflows/dashboards-helper-build-and-push-ghcr.yml index 6c39f4344..2a481995e 100644 --- a/.github/workflows/dashboards-helper-build-and-push-ghcr.yml +++ b/.github/workflows/dashboards-helper-build-and-push-ghcr.yml @@ -123,7 +123,7 @@ jobs: tags: ghcr.io/${{ github.repository_owner }}/malcolm/dashboards-helper:${{ steps.extract_branch.outputs.branch }} - name: Run Trivy vulnerability scanner - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} id: trivy-scan uses: aquasecurity/trivy-action@master with: @@ -139,7 +139,7 @@ jobs: exit-code: '0' - name: Upload Trivy scan results to GitHub Security tab - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} uses: github/codeql-action/upload-sarif@v3 with: sarif_file: 'trivy-results.sarif' diff --git a/.github/workflows/dirinit-build-and-push-ghcr.yml b/.github/workflows/dirinit-build-and-push-ghcr.yml index 707a5c66b..0cd96ad87 100644 --- a/.github/workflows/dirinit-build-and-push-ghcr.yml +++ b/.github/workflows/dirinit-build-and-push-ghcr.yml @@ -111,7 +111,7 @@ jobs: tags: ghcr.io/${{ github.repository_owner }}/malcolm/dirinit:${{ steps.extract_branch.outputs.branch }} - name: Run Trivy vulnerability scanner - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} id: trivy-scan uses: aquasecurity/trivy-action@master with: @@ -127,7 +127,7 @@ jobs: exit-code: '0' - name: Upload Trivy scan results to GitHub Security tab - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} uses: github/codeql-action/upload-sarif@v3 with: sarif_file: 'trivy-results.sarif' diff --git a/.github/workflows/file-monitor-build-and-push-ghcr.yml b/.github/workflows/file-monitor-build-and-push-ghcr.yml index 3823368fc..194dc33dc 100644 --- a/.github/workflows/file-monitor-build-and-push-ghcr.yml +++ b/.github/workflows/file-monitor-build-and-push-ghcr.yml @@ -121,7 +121,7 @@ jobs: tags: ghcr.io/${{ github.repository_owner }}/malcolm/file-monitor:${{ steps.extract_branch.outputs.branch }} - name: Run Trivy vulnerability scanner - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} id: trivy-scan uses: aquasecurity/trivy-action@master with: @@ -137,7 +137,7 @@ jobs: exit-code: '0' - name: Upload Trivy scan results to GitHub Security tab - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} uses: github/codeql-action/upload-sarif@v3 with: sarif_file: 'trivy-results.sarif' diff --git a/.github/workflows/file-upload-build-and-push-ghcr.yml b/.github/workflows/file-upload-build-and-push-ghcr.yml index 00c119f33..d89700e50 100644 --- a/.github/workflows/file-upload-build-and-push-ghcr.yml +++ b/.github/workflows/file-upload-build-and-push-ghcr.yml @@ -123,7 +123,7 @@ jobs: tags: ghcr.io/${{ github.repository_owner }}/malcolm/file-upload:${{ steps.extract_branch.outputs.branch }} - name: Run Trivy vulnerability scanner - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} id: trivy-scan uses: aquasecurity/trivy-action@master with: @@ -139,7 +139,7 @@ jobs: exit-code: '0' - name: Upload Trivy scan results to GitHub Security tab - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} uses: github/codeql-action/upload-sarif@v3 with: sarif_file: 'trivy-results.sarif' diff --git a/.github/workflows/filebeat-build-and-push-ghcr.yml b/.github/workflows/filebeat-build-and-push-ghcr.yml index fea0f7f8c..3ea6a0ad2 100644 --- a/.github/workflows/filebeat-build-and-push-ghcr.yml +++ b/.github/workflows/filebeat-build-and-push-ghcr.yml @@ -123,7 +123,7 @@ jobs: tags: ghcr.io/${{ github.repository_owner }}/malcolm/filebeat-oss:${{ steps.extract_branch.outputs.branch }} - name: Run Trivy vulnerability scanner - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} id: trivy-scan uses: aquasecurity/trivy-action@master with: @@ -139,7 +139,7 @@ jobs: exit-code: '0' - name: Upload Trivy scan results to GitHub Security tab - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} uses: github/codeql-action/upload-sarif@v3 with: sarif_file: 'trivy-results.sarif' diff --git a/.github/workflows/freq-build-and-push-ghcr.yml b/.github/workflows/freq-build-and-push-ghcr.yml index 2e8f40a33..991db2f3c 100644 --- a/.github/workflows/freq-build-and-push-ghcr.yml +++ b/.github/workflows/freq-build-and-push-ghcr.yml @@ -123,7 +123,7 @@ jobs: tags: ghcr.io/${{ github.repository_owner }}/malcolm/freq:${{ steps.extract_branch.outputs.branch }} - name: Run Trivy vulnerability scanner - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} id: trivy-scan uses: aquasecurity/trivy-action@master with: @@ -139,7 +139,7 @@ jobs: exit-code: '0' - name: Upload Trivy scan results to GitHub Security tab - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} uses: github/codeql-action/upload-sarif@v3 with: sarif_file: 'trivy-results.sarif' 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 af87e8911..02f7fa4ef 100644 --- a/.github/workflows/hedgehog-iso-build-docker-wrap-push-ghcr.yml +++ b/.github/workflows/hedgehog-iso-build-docker-wrap-push-ghcr.yml @@ -114,7 +114,7 @@ jobs: popd - name: Run Trivy vulnerability scanner - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} id: trivy-scan uses: aquasecurity/trivy-action@master with: @@ -129,7 +129,7 @@ jobs: exit-code: '0' - name: Upload Trivy scan results to GitHub Security tab - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} uses: github/codeql-action/upload-sarif@v3 with: sarif_file: 'trivy-results.sarif' diff --git a/.github/workflows/htadmin-build-and-push-ghcr.yml b/.github/workflows/htadmin-build-and-push-ghcr.yml index 8546f6548..341e6fa6e 100644 --- a/.github/workflows/htadmin-build-and-push-ghcr.yml +++ b/.github/workflows/htadmin-build-and-push-ghcr.yml @@ -123,7 +123,7 @@ jobs: tags: ghcr.io/${{ github.repository_owner }}/malcolm/htadmin:${{ steps.extract_branch.outputs.branch }} - name: Run Trivy vulnerability scanner - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} id: trivy-scan uses: aquasecurity/trivy-action@master with: @@ -139,7 +139,7 @@ jobs: exit-code: '0' - name: Upload Trivy scan results to GitHub Security tab - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} uses: github/codeql-action/upload-sarif@v3 with: sarif_file: 'trivy-results.sarif' diff --git a/.github/workflows/logstash-build-and-push-ghcr.yml b/.github/workflows/logstash-build-and-push-ghcr.yml index c412d4ae4..8169666ea 100644 --- a/.github/workflows/logstash-build-and-push-ghcr.yml +++ b/.github/workflows/logstash-build-and-push-ghcr.yml @@ -123,7 +123,7 @@ jobs: tags: ghcr.io/${{ github.repository_owner }}/malcolm/logstash-oss:${{ steps.extract_branch.outputs.branch }} - name: Run Trivy vulnerability scanner - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} id: trivy-scan uses: aquasecurity/trivy-action@master with: @@ -139,7 +139,7 @@ jobs: exit-code: '0' - name: Upload Trivy scan results to GitHub Security tab - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} uses: github/codeql-action/upload-sarif@v3 with: sarif_file: 'trivy-results.sarif' 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 27a887aac..697472519 100644 --- a/.github/workflows/malcolm-iso-build-docker-wrap-push-ghcr.yml +++ b/.github/workflows/malcolm-iso-build-docker-wrap-push-ghcr.yml @@ -122,7 +122,7 @@ jobs: popd - name: Run Trivy vulnerability scanner - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} id: trivy-scan uses: aquasecurity/trivy-action@master with: @@ -137,7 +137,7 @@ jobs: exit-code: '0' - name: Upload Trivy scan results to GitHub Security tab - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} uses: github/codeql-action/upload-sarif@v3 with: sarif_file: 'trivy-results.sarif' diff --git a/.github/workflows/netbox-build-and-push-ghcr.yml b/.github/workflows/netbox-build-and-push-ghcr.yml index d6728f895..973593e18 100644 --- a/.github/workflows/netbox-build-and-push-ghcr.yml +++ b/.github/workflows/netbox-build-and-push-ghcr.yml @@ -123,7 +123,7 @@ jobs: tags: ghcr.io/${{ github.repository_owner }}/malcolm/netbox:${{ steps.extract_branch.outputs.branch }} - name: Run Trivy vulnerability scanner - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} id: trivy-scan uses: aquasecurity/trivy-action@master with: @@ -139,7 +139,7 @@ jobs: exit-code: '0' - name: Upload Trivy scan results to GitHub Security tab - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} uses: github/codeql-action/upload-sarif@v3 with: sarif_file: 'trivy-results.sarif' diff --git a/.github/workflows/nginx-build-and-push-ghcr.yml b/.github/workflows/nginx-build-and-push-ghcr.yml index 2336448cc..9cd013ffd 100644 --- a/.github/workflows/nginx-build-and-push-ghcr.yml +++ b/.github/workflows/nginx-build-and-push-ghcr.yml @@ -130,7 +130,7 @@ jobs: tags: ghcr.io/${{ github.repository_owner }}/malcolm/nginx-proxy:${{ steps.extract_branch.outputs.branch }} - name: Run Trivy vulnerability scanner - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} id: trivy-scan uses: aquasecurity/trivy-action@master with: @@ -146,7 +146,7 @@ jobs: exit-code: '0' - name: Upload Trivy scan results to GitHub Security tab - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} uses: github/codeql-action/upload-sarif@v3 with: sarif_file: 'trivy-results.sarif' diff --git a/.github/workflows/opensearch-build-and-push-ghcr.yml b/.github/workflows/opensearch-build-and-push-ghcr.yml index ae4418730..0876f54da 100644 --- a/.github/workflows/opensearch-build-and-push-ghcr.yml +++ b/.github/workflows/opensearch-build-and-push-ghcr.yml @@ -122,7 +122,7 @@ jobs: tags: ghcr.io/${{ github.repository_owner }}/malcolm/opensearch:${{ steps.extract_branch.outputs.branch }} - name: Run Trivy vulnerability scanner - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} id: trivy-scan uses: aquasecurity/trivy-action@master with: @@ -138,7 +138,7 @@ jobs: exit-code: '0' - name: Upload Trivy scan results to GitHub Security tab - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} uses: github/codeql-action/upload-sarif@v3 with: sarif_file: 'trivy-results.sarif' diff --git a/.github/workflows/pcap-capture-build-and-push-ghcr.yml b/.github/workflows/pcap-capture-build-and-push-ghcr.yml index ed56b18db..784e8b3af 100644 --- a/.github/workflows/pcap-capture-build-and-push-ghcr.yml +++ b/.github/workflows/pcap-capture-build-and-push-ghcr.yml @@ -123,7 +123,7 @@ jobs: tags: ghcr.io/${{ github.repository_owner }}/malcolm/pcap-capture:${{ steps.extract_branch.outputs.branch }} - name: Run Trivy vulnerability scanner - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} id: trivy-scan uses: aquasecurity/trivy-action@master with: @@ -139,7 +139,7 @@ jobs: exit-code: '0' - name: Upload Trivy scan results to GitHub Security tab - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} uses: github/codeql-action/upload-sarif@v3 with: sarif_file: 'trivy-results.sarif' diff --git a/.github/workflows/pcap-monitor-build-and-push-ghcr.yml b/.github/workflows/pcap-monitor-build-and-push-ghcr.yml index 96bb88a03..8e38e0064 100644 --- a/.github/workflows/pcap-monitor-build-and-push-ghcr.yml +++ b/.github/workflows/pcap-monitor-build-and-push-ghcr.yml @@ -123,7 +123,7 @@ jobs: tags: ghcr.io/${{ github.repository_owner }}/malcolm/pcap-monitor:${{ steps.extract_branch.outputs.branch }} - name: Run Trivy vulnerability scanner - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} id: trivy-scan uses: aquasecurity/trivy-action@master with: @@ -139,7 +139,7 @@ jobs: exit-code: '0' - name: Upload Trivy scan results to GitHub Security tab - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} uses: github/codeql-action/upload-sarif@v3 with: sarif_file: 'trivy-results.sarif' diff --git a/.github/workflows/postgresql-build-and-push-ghcr.yml b/.github/workflows/postgresql-build-and-push-ghcr.yml index 82cf5049b..94c056523 100644 --- a/.github/workflows/postgresql-build-and-push-ghcr.yml +++ b/.github/workflows/postgresql-build-and-push-ghcr.yml @@ -122,7 +122,7 @@ jobs: tags: ghcr.io/${{ github.repository_owner }}/malcolm/postgresql:${{ steps.extract_branch.outputs.branch }} - name: Run Trivy vulnerability scanner - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} id: trivy-scan uses: aquasecurity/trivy-action@master with: @@ -138,7 +138,7 @@ jobs: exit-code: '0' - name: Upload Trivy scan results to GitHub Security tab - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} uses: github/codeql-action/upload-sarif@v3 with: sarif_file: 'trivy-results.sarif' diff --git a/.github/workflows/suricata-build-and-push-ghcr.yml b/.github/workflows/suricata-build-and-push-ghcr.yml index 24c2234bf..97a771a23 100644 --- a/.github/workflows/suricata-build-and-push-ghcr.yml +++ b/.github/workflows/suricata-build-and-push-ghcr.yml @@ -122,7 +122,7 @@ jobs: tags: ghcr.io/${{ github.repository_owner }}/malcolm/suricata:${{ steps.extract_branch.outputs.branch }} - name: Run Trivy vulnerability scanner - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} id: trivy-scan uses: aquasecurity/trivy-action@master with: @@ -138,7 +138,7 @@ jobs: exit-code: '0' - name: Upload Trivy scan results to GitHub Security tab - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} uses: github/codeql-action/upload-sarif@v3 with: sarif_file: 'trivy-results.sarif' diff --git a/.github/workflows/zeek-build-and-push-ghcr.yml b/.github/workflows/zeek-build-and-push-ghcr.yml index 753ef28f4..21eba1529 100644 --- a/.github/workflows/zeek-build-and-push-ghcr.yml +++ b/.github/workflows/zeek-build-and-push-ghcr.yml @@ -123,7 +123,7 @@ jobs: tags: ghcr.io/${{ github.repository_owner }}/malcolm/zeek:${{ steps.extract_branch.outputs.branch }} - name: Run Trivy vulnerability scanner - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} id: trivy-scan uses: aquasecurity/trivy-action@master with: @@ -139,7 +139,7 @@ jobs: exit-code: '0' - name: Upload Trivy scan results to GitHub Security tab - if: ${{ matrix.value }} == 'linux/amd64' + if: ${{ matrix.value == 'linux/amd64' }} uses: github/codeql-action/upload-sarif@v3 with: sarif_file: 'trivy-results.sarif'