|
75 | 75 | env: |
76 | 76 | ECR_REGISTRY: ${{ steps.login-ecr-public.outputs.registry }} |
77 | 77 | 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 }}" |
80 | 80 | run: | |
81 | 81 | if [ "${{ matrix.arch }}" = "x86_64" ]; then |
82 | 82 | 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: |
114 | 114 | with: |
115 | 115 | registry-type: public |
116 | 116 | - name: Create ECR manifest with explicit tag |
117 | | - if: github.event.release.name != '' |
118 | 117 | id: create-ecr-manifest-explicit |
119 | 118 | run: | |
120 | 119 | docker manifest create "${{ needs.build-and-upload-image-to-ecr.outputs.ecr_registry_repository }}:${{ steps.version.outputs.VERSION }}" \ |
121 | 120 | "${{ needs.build-and-upload-image-to-ecr.outputs.full_image_x86_64 }}" \ |
122 | 121 | "${{ needs.build-and-upload-image-to-ecr.outputs.full_image_arm64 }}" |
123 | 122 | - name: Annotate ECR manifest with explicit arm64 tag |
124 | | - if: github.event.release.name != '' |
125 | 123 | id: annotate-ecr-manifest-explicit-arm64 |
126 | 124 | run: | |
127 | 125 | docker manifest annotate "${{ needs.build-and-upload-image-to-ecr.outputs.ecr_registry_repository }}:${{ steps.version.outputs.VERSION }}" \ |
128 | 126 | "${{ needs.build-and-upload-image-to-ecr.outputs.full_image_arm64 }}" \ |
129 | 127 | --arch arm64 \ |
130 | 128 | --os linux |
131 | 129 | - name: Annotate ECR manifest with explicit amd64 tag |
132 | | - if: github.event.release.name != '' |
133 | 130 | id: annotate-ecr-manifest-explicit-amd64 |
134 | 131 | run: | |
135 | 132 | docker manifest annotate "${{ needs.build-and-upload-image-to-ecr.outputs.ecr_registry_repository }}:${{ steps.version.outputs.VERSION }}" \ |
136 | 133 | "${{ needs.build-and-upload-image-to-ecr.outputs.full_image_x86_64 }}" \ |
137 | 134 | --arch amd64 \ |
138 | 135 | --os linux |
139 | 136 | - name: Push ECR manifest with explicit version |
140 | | - if: github.event.release.name != '' |
141 | 137 | id: push-ecr-manifest-explicit |
142 | 138 | run: | |
143 | 139 | docker manifest push "${{ needs.build-and-upload-image-to-ecr.outputs.ecr_registry_repository }}:${{ steps.version.outputs.VERSION }}" |
|
0 commit comments