From 411ff07e8ddbcad39fe8f80e8c3ac3ad08236b60 Mon Sep 17 00:00:00 2001 From: Brian DeHamer Date: Thu, 13 Jun 2024 09:18:23 -0700 Subject: [PATCH] registry test clean-up Signed-off-by: Brian DeHamer --- .github/workflows/oci-amazon.yml | 12 ++---------- .github/workflows/oci-docker-hub.yml | 2 +- .github/workflows/oci-github.yml | 10 +--------- .github/workflows/oci-google.yml | 11 +---------- 4 files changed, 5 insertions(+), 30 deletions(-) diff --git a/.github/workflows/oci-amazon.yml b/.github/workflows/oci-amazon.yml index 34e9249..7f138de 100644 --- a/.github/workflows/oci-amazon.yml +++ b/.github/workflows/oci-amazon.yml @@ -18,7 +18,7 @@ jobs: attestations: write env: REGISTRY: 123509514931.dkr.ecr.us-east-1.amazonaws.com - IMAGE_NAME: bdehamer/attest-demo + IMAGE_NAME: ${{ github.repository }} steps: - name: Build artifact run: date > artifact.bin @@ -57,17 +57,9 @@ jobs: tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest - name: Attest artifact - uses: actions/attest@v1 + uses: actions/attest-build-provenance@v1 with: subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} subject-digest: ${{ steps.push.outputs.digest }} - predicate-type: application/json - predicate: ${{ toJson(github) }} push-to-registry: true - #- name: Attest artifact - #uses: actions/attest-build-provenance@v1 - #with: - #subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - #subject-digest: ${{ steps.push.outputs.digest }} - #push-to-registry: true diff --git a/.github/workflows/oci-docker-hub.yml b/.github/workflows/oci-docker-hub.yml index 4bab969..ea6ddf3 100644 --- a/.github/workflows/oci-docker-hub.yml +++ b/.github/workflows/oci-docker-hub.yml @@ -18,7 +18,7 @@ jobs: attestations: write env: REGISTRY: docker.io - IMAGE_NAME: bdehamer/attest-demo + IMAGE_NAME: ${{ github.repository }} steps: - name: Build artifact run: date > artifact.bin diff --git a/.github/workflows/oci-github.yml b/.github/workflows/oci-github.yml index 150da22..358c93f 100644 --- a/.github/workflows/oci-github.yml +++ b/.github/workflows/oci-github.yml @@ -50,17 +50,9 @@ jobs: tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest - name: Attest artifact - uses: actions/attest@v1 + uses: actions/attest-build-provenance@v1 with: subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} subject-digest: ${{ steps.build-and-push.outputs.digest }} - predicate-type: text/plain - predicate: '{}' push-to-registry: true - #- name: Attest artifact - #uses: actions/attest-build-provenance@v1 - #with: - #subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - #subject-digest: ${{ steps.build-and-push.outputs.digest }} - #push-to-registry: true diff --git a/.github/workflows/oci-google.yml b/.github/workflows/oci-google.yml index 2d9cba4..2aab593 100644 --- a/.github/workflows/oci-google.yml +++ b/.github/workflows/oci-google.yml @@ -18,7 +18,7 @@ jobs: attestations: write env: REGISTRY: us-west1-docker.pkg.dev - IMAGE_NAME: dehamer24/bdehamer/attest-demo + IMAGE_NAME: dehamer24/${{ github.repository }} steps: - name: Build artifact run: date > artifact.bin @@ -66,12 +66,3 @@ jobs: subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} subject-digest: ${{ steps.push.outputs.digest }} push-to-registry: true - - - name: Attest artifact - uses: actions/attest@v1 - with: - subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - subject-digest: ${{ steps.push.outputs.digest }} - predicate-type: application/json - predicate: ${{ toJson(github) }} - push-to-registry: true