Skip to content

Commit

Permalink
workflow updates for multiarch
Browse files Browse the repository at this point in the history
  • Loading branch information
mmguero committed May 7, 2024
1 parent c591748 commit 2281148
Show file tree
Hide file tree
Showing 21 changed files with 42 additions and 42 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/api-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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'
4 changes: 2 additions & 2 deletions .github/workflows/arkime-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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'
4 changes: 2 additions & 2 deletions .github/workflows/dashboards-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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'
4 changes: 2 additions & 2 deletions .github/workflows/dashboards-helper-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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'
4 changes: 2 additions & 2 deletions .github/workflows/dirinit-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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'
4 changes: 2 additions & 2 deletions .github/workflows/file-monitor-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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'
4 changes: 2 additions & 2 deletions .github/workflows/file-upload-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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'
4 changes: 2 additions & 2 deletions .github/workflows/filebeat-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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'
4 changes: 2 additions & 2 deletions .github/workflows/freq-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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'
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/htadmin-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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'
4 changes: 2 additions & 2 deletions .github/workflows/logstash-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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'
4 changes: 2 additions & 2 deletions .github/workflows/malcolm-iso-build-docker-wrap-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/netbox-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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'
4 changes: 2 additions & 2 deletions .github/workflows/nginx-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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'
4 changes: 2 additions & 2 deletions .github/workflows/opensearch-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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'
4 changes: 2 additions & 2 deletions .github/workflows/pcap-capture-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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'
4 changes: 2 additions & 2 deletions .github/workflows/pcap-monitor-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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'
4 changes: 2 additions & 2 deletions .github/workflows/postgresql-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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'
4 changes: 2 additions & 2 deletions .github/workflows/suricata-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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'
4 changes: 2 additions & 2 deletions .github/workflows/zeek-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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'

0 comments on commit 2281148

Please sign in to comment.