From 3f0e2a23871cf6147e3a13e1754703ea277fa860 Mon Sep 17 00:00:00 2001 From: Wojciech Piotrowiak Date: Wed, 30 Oct 2024 17:07:31 +0100 Subject: [PATCH 1/7] AAE-26244 ECR Docker image URL --- .github/actions/docker-build-image/action.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/actions/docker-build-image/action.yml b/.github/actions/docker-build-image/action.yml index 718769e4b..328868e53 100644 --- a/.github/actions/docker-build-image/action.yml +++ b/.github/actions/docker-build-image/action.yml @@ -53,6 +53,10 @@ inputs: description: The label name for creating a preview version required: false default: 'preview' +outputs: + ecr-docker-image-url: + description: The ECR docker image URL + value: ${{ steps.login-ecr.outputs.registry }}/${{ env.IMAGE_NAME }}@${{ steps.build-and-push.outputs.digest }}" runs: using: composite From 2659561aa3d47506e301e7daf61e34dfd7abb27e Mon Sep 17 00:00:00 2001 From: Wojciech Piotrowiak Date: Wed, 30 Oct 2024 21:19:58 +0100 Subject: [PATCH 2/7] AAE-26244 fix --- .github/actions/docker-build-image/action.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/actions/docker-build-image/action.yml b/.github/actions/docker-build-image/action.yml index 328868e53..d77ee181d 100644 --- a/.github/actions/docker-build-image/action.yml +++ b/.github/actions/docker-build-image/action.yml @@ -56,7 +56,7 @@ inputs: outputs: ecr-docker-image-url: description: The ECR docker image URL - value: ${{ steps.login-ecr.outputs.registry }}/${{ env.IMAGE_NAME }}@${{ steps.build-and-push.outputs.digest }}" + value: ${{ steps.set-ecr-docker-image-url.outputs.ecr-docker-image-url }} runs: using: composite @@ -234,3 +234,9 @@ runs: echo "${{ steps.login-ecr.outputs.registry }}/${{ env.IMAGE_NAME }}@${{ steps.build-and-push.outputs.digest }}" echo "\`\`\`\`" } >> $GITHUB_STEP_SUMMARY + + - name: set ecr-docker-image-url + id: set-ecr-docker-image-url + if: env.PUSH_IMAGE == 'true' + shell: bash + run: echo "ecr-docker-image-url=${steps.login-ecr.outputs.registry}/${env.IMAGE_NAME}:${steps.build-and-push.outputs.digest}" >> $GITHUB_ENV From 6f8d1623ba0cce45fe721837bafded9df16a7970 Mon Sep 17 00:00:00 2001 From: Wojciech Piotrowiak Date: Wed, 30 Oct 2024 22:17:41 +0100 Subject: [PATCH 3/7] AAE-26244 fix2 --- .github/actions/docker-build-image/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/docker-build-image/action.yml b/.github/actions/docker-build-image/action.yml index d77ee181d..60d581d95 100644 --- a/.github/actions/docker-build-image/action.yml +++ b/.github/actions/docker-build-image/action.yml @@ -239,4 +239,4 @@ runs: id: set-ecr-docker-image-url if: env.PUSH_IMAGE == 'true' shell: bash - run: echo "ecr-docker-image-url=${steps.login-ecr.outputs.registry}/${env.IMAGE_NAME}:${steps.build-and-push.outputs.digest}" >> $GITHUB_ENV + run: echo "ecr-docker-image-url=${{ steps.login-ecr.outputs.registry }}/${{ env.IMAGE_NAME }}@${{ steps.build-and-push.outputs.digest }}" >> $GITHUB_ENV From 8f1db95c2f824ab3f207a6fb0c397f4c8780877a Mon Sep 17 00:00:00 2001 From: Wojciech Piotrowiak Date: Thu, 31 Oct 2024 07:17:47 +0100 Subject: [PATCH 4/7] AAE-26244 output --- .github/actions/docker-build-image/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/docker-build-image/action.yml b/.github/actions/docker-build-image/action.yml index 60d581d95..c9d81e89c 100644 --- a/.github/actions/docker-build-image/action.yml +++ b/.github/actions/docker-build-image/action.yml @@ -239,4 +239,4 @@ runs: id: set-ecr-docker-image-url if: env.PUSH_IMAGE == 'true' shell: bash - run: echo "ecr-docker-image-url=${{ steps.login-ecr.outputs.registry }}/${{ env.IMAGE_NAME }}@${{ steps.build-and-push.outputs.digest }}" >> $GITHUB_ENV + run: echo "ecr-docker-image-url=${{ steps.login-ecr.outputs.registry }}/${{ env.IMAGE_NAME }}@${{ steps.build-and-push.outputs.digest }}" >> $GITHUB_OUTPUT From 7742294caf1410f845f3361c6bb9ebcaf22cf45f Mon Sep 17 00:00:00 2001 From: Wojciech Piotrowiak Date: Fri, 8 Nov 2024 12:50:37 +0100 Subject: [PATCH 5/7] AAE-26244 Version bump --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index b21d96d17..bd433e35d 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -v8.3.0 +v8.3.1 From ee61cffdafa7bb1bde92c8f62de558458d7b0a21 Mon Sep 17 00:00:00 2001 From: Wojciech Piotrowiak Date: Fri, 8 Nov 2024 13:12:01 +0100 Subject: [PATCH 6/7] AAE-26244 documentation --- docs/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/README.md b/docs/README.md index c52ae3868..6999b9817 100644 --- a/docs/README.md +++ b/docs/README.md @@ -454,6 +454,7 @@ When using OIDC on AWS, inputs `aws-access-key-id` and `aws-secret-access-key` c # grype-fail-build: true # optional # preview-label: ${{ vars.PREVIEW_LABEL }} # optional ``` +The returned output is the ECR image digest. ### docker-dump-containers-logs From 1799f957636b93d8dbdb5b10d01bfc1e83540114 Mon Sep 17 00:00:00 2001 From: Wojciech Piotrowiak Date: Fri, 8 Nov 2024 13:13:34 +0100 Subject: [PATCH 7/7] AAE-26244 documentation --- docs/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/README.md b/docs/README.md index 6999b9817..fe335a97e 100644 --- a/docs/README.md +++ b/docs/README.md @@ -454,6 +454,7 @@ When using OIDC on AWS, inputs `aws-access-key-id` and `aws-secret-access-key` c # grype-fail-build: true # optional # preview-label: ${{ vars.PREVIEW_LABEL }} # optional ``` + The returned output is the ECR image digest. ### docker-dump-containers-logs