Merge branch 'main' into patch-1

aquasecurity · Oct 14, 2024 · 38258f1 · 38258f1
2 parents 8d3772f + c00f263
commit 38258f1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -33,7 +33,7 @@ jobs:
           tags=(latest ${{ env.RELEASE_VERSION}} ${{env.MINOR_VERSION }} ${{ env.MAJOR_VERSION }})
           for tag in ${tags[@]}; do
               oras push ghcr.io/aquasecurity/trivy-policies:${tag} \
-              --config /dev/null:application/vnd.cncf.openpolicyagent.config.v1+json \
+              --artifact-type application/vnd.cncf.openpolicyagent.config.v1+json \
               --annotation "org.opencontainers.image.source=$GITHUB_SERVER_URL/$GITHUB_REPOSITORY" \
               --annotation "org.opencontainers.image.revision=$GITHUB_SHA" \
               bundle.tar.gz:application/vnd.cncf.openpolicyagent.layer.v1.tar+gzip
@@ -45,11 +45,10 @@ jobs:
             "public.ecr.aws"
           )
           tags=(latest ${{ env.RELEASE_VERSION}} ${{env.MINOR_VERSION }} ${{ env.MAJOR_VERSION }})
-
           for registry in "${registries[@]}"; do
             for tag in ${tags[@]}; do
               oras push ${registry}/${{ github.repository }}:${tag} \
-              --config /dev/null:application/vnd.cncf.openpolicyagent.config.v1+json \
+              --artifact-type application/vnd.cncf.openpolicyagent.config.v1+json \
               bundle.tar.gz:application/vnd.cncf.openpolicyagent.layer.v1.tar+gzip
             done
           done
diff --git a/scripts/verify-bundle.go b/scripts/verify-bundle.go
@@ -14,7 +14,7 @@ import (
 )
 
 var bundlePath = "bundle.tar.gz"
-var OrasPush = []string{"--config", "/dev/null:application/vnd.cncf.openpolicyagent.config.v1+json", fmt.Sprintf("%s:application/vnd.cncf.openpolicyagent.layer.v1.tar+gzip", bundlePath)}
+var OrasPush = []string{"--artifact-type", "application/vnd.cncf.openpolicyagent.config.v1+json", fmt.Sprintf("%s:application/vnd.cncf.openpolicyagent.layer.v1.tar+gzip", bundlePath)}
 var supportedTrivyVersions = []string{"latest", "canary"} // TODO: add more versions
 
 func createRegistryContainer(ctx context.Context) (testcontainers.Container, string) {