Merge branch 'master' into create-product

.github/workflows/trivy.yml

@@ -37,8 +37,7 @@ jobs:
         uses: aquasecurity/[email protected]
         with:
           image-ref: 'docker.io/my-organization/my-app:${{ github.sha }}'
-          format: 'template'
-          template: '@/contrib/sarif.tpl'
+          format: 'sarif'
           output: 'trivy-results.sarif'
           severity: 'CRITICAL,HIGH'