diff --git a/.github/workflows/make.yaml b/.github/workflows/make.yaml index 92ee968e2..2a98a627a 100644 --- a/.github/workflows/make.yaml +++ b/.github/workflows/make.yaml @@ -19,8 +19,6 @@ jobs: env: DOCKER_BUILD_FLAGS: "--push" DOCKER_TAG_NAME: ${{ startsWith(github.ref, 'refs/tags/') && github.ref_name || 'latest' }} - TRIVY_SKIP_DB_UPDATE: "true" - TRIVY_SKIP_JAVA_DB_UPDATE: "true" steps: - uses: "actions/checkout@v4" - uses: "docker/setup-qemu-action@v2" @@ -31,14 +29,27 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - run: "make docker-build" - - uses: aquasecurity/trivy-action@0.28.0 + + trivy-scan: + name: "trivy-scan" + needs: + - "docker-build" + runs-on: "ubuntu-22.04" + permissions: + contents: "read" + packages: "read" + env: + DOCKER_TAG_NAME: ${{ startsWith(github.ref, 'refs/tags/') && github.ref_name || 'latest' }} + steps: + - uses: "aquasecurity/trivy-action@0.28.0" with: image-ref: 'ghcr.io/getprobo/probo:${{ env.DOCKER_TAG_NAME }}' - format: 'table' - exit-code: '1' + format: "table" + exit-code: 1 ignore-unfixed: true - vuln-type: 'os,library' - severity: 'CRITICAL,HIGH' + vuln-type: "os,library" + severity: "CRITICAL,HIGH" + build: name: "build" runs-on: "ubuntu-22.04"