Skip to content

Commit d31fa7f

Browse files
committed
chore: remove condition on explicit version tag manifest and images
1 parent 5e8cbc7 commit d31fa7f

1 file changed

Lines changed: 2 additions & 6 deletions

File tree

.github/workflows/ecr-release.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ jobs:
7575
env:
7676
ECR_REGISTRY: ${{ steps.login-ecr-public.outputs.registry }}
7777
ECR_REPOSITORY: ${{ env.ecr_repository_name }}
78-
IMAGE_TAG: "${{ env.image_tag }}${{ github.event.release.name }}"
79-
PER_ARCH_IMAGE_TAG: "${{ matrix.arch }}${{ github.event.release.name }}"
78+
IMAGE_TAG: "${{ env.image_tag }}${{ steps.version.outputs.VERSION }}"
79+
PER_ARCH_IMAGE_TAG: "${{ matrix.arch }}${{ steps.version.outputs.VERSION }}"
8080
run: |
8181
if [ "${{ matrix.arch }}" = "x86_64" ]; then
8282
docker build --platform linux/amd64 --provenance false "${{ env.docker_build_dir }}" -f "${{ env.path_to_dockerfile }}" -t "$ECR_REGISTRY/$ECR_REPOSITORY:$PER_ARCH_IMAGE_TAG"
@@ -114,30 +114,26 @@ jobs:
114114
with:
115115
registry-type: public
116116
- name: Create ECR manifest with explicit tag
117-
if: github.event.release.name != ''
118117
id: create-ecr-manifest-explicit
119118
run: |
120119
docker manifest create "${{ needs.build-and-upload-image-to-ecr.outputs.ecr_registry_repository }}:${{ steps.version.outputs.VERSION }}" \
121120
"${{ needs.build-and-upload-image-to-ecr.outputs.full_image_x86_64 }}" \
122121
"${{ needs.build-and-upload-image-to-ecr.outputs.full_image_arm64 }}"
123122
- name: Annotate ECR manifest with explicit arm64 tag
124-
if: github.event.release.name != ''
125123
id: annotate-ecr-manifest-explicit-arm64
126124
run: |
127125
docker manifest annotate "${{ needs.build-and-upload-image-to-ecr.outputs.ecr_registry_repository }}:${{ steps.version.outputs.VERSION }}" \
128126
"${{ needs.build-and-upload-image-to-ecr.outputs.full_image_arm64 }}" \
129127
--arch arm64 \
130128
--os linux
131129
- name: Annotate ECR manifest with explicit amd64 tag
132-
if: github.event.release.name != ''
133130
id: annotate-ecr-manifest-explicit-amd64
134131
run: |
135132
docker manifest annotate "${{ needs.build-and-upload-image-to-ecr.outputs.ecr_registry_repository }}:${{ steps.version.outputs.VERSION }}" \
136133
"${{ needs.build-and-upload-image-to-ecr.outputs.full_image_x86_64 }}" \
137134
--arch amd64 \
138135
--os linux
139136
- name: Push ECR manifest with explicit version
140-
if: github.event.release.name != ''
141137
id: push-ecr-manifest-explicit
142138
run: |
143139
docker manifest push "${{ needs.build-and-upload-image-to-ecr.outputs.ecr_registry_repository }}:${{ steps.version.outputs.VERSION }}"

0 commit comments

Comments
 (0)