Merge branch 'main' into sh-add-temp

Author: SevenWaysDP

.github/workflows/push.yml

@@ -164,31 +164,3 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - run: echo "deploy was successful"
-
-  trivy-vulnerability-scanning:
-    needs:
-      - build_and_push
-      - branch_meta
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-    steps:
-      - name: run trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@0.33.1
-        with:
-          image-ref: 'ghcr.io/${{ github.repository }}:${{ needs.branch_meta.outputs.sha }}'
-          format: 'sarif'
-          output: 'trivy-results.sarif'
-          scan-type: 'image'
-          severity: 'CRITICAL,HIGH'
-          ignore-unfixed: true
-        env:
-          TRIVY_SKIP_DB_UPDATE: true
-          TRIVY_SKIP_JAVA_DB_UPDATE: true
-      - name: upload trivy results
-        if: ${{ always() }}
-        uses: github/codeql-action/upload-sarif@v3
-        with:
-          sarif_file: 'trivy-results.sarif'