Skip to content

Commit f26153c

Browse files
committed
fix: use short SHA tag for ECR publish to match GHCR tags
1 parent 025fee4 commit f26153c

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

.github/workflows/build-sandboxes.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,9 @@ jobs:
266266
steps:
267267
- name: Lowercase image prefix
268268
id: repo
269-
run: echo "image_prefix=${IMAGE_PREFIX,,}" >> "$GITHUB_OUTPUT"
269+
run: |
270+
echo "image_prefix=${IMAGE_PREFIX,,}" >> "$GITHUB_OUTPUT"
271+
echo "short_sha=${GITHUB_SHA::7}" >> "$GITHUB_OUTPUT"
270272
271273
- name: Set up Docker Buildx
272274
uses: docker/setup-buildx-action@v3
@@ -287,12 +289,12 @@ jobs:
287289
set -euo pipefail
288290
GHCR_IMAGE="${{ env.REGISTRY }}/${{ steps.repo.outputs.image_prefix }}/sandboxes/base"
289291
ECR_IMAGE="${{ env.ECR_REGISTRY }}/${{ env.ECR_IMAGE_PREFIX }}/sandboxes/base"
290-
SHA="${{ github.sha }}"
292+
SHORT_SHA="${{ steps.repo.outputs.short_sha }}"
291293
292-
echo "Copying ${GHCR_IMAGE}:${SHA} -> ${ECR_IMAGE}:${SHA}"
294+
echo "Copying ${GHCR_IMAGE}:${SHORT_SHA} -> ${ECR_IMAGE}:${SHORT_SHA}"
293295
docker buildx imagetools create \
294-
-t "${ECR_IMAGE}:${SHA}" \
295-
"${GHCR_IMAGE}:${SHA}"
296+
-t "${ECR_IMAGE}:${SHORT_SHA}" \
297+
"${GHCR_IMAGE}:${SHORT_SHA}"
296298
297299
echo "Copying ${GHCR_IMAGE}:latest -> ${ECR_IMAGE}:latest"
298300
docker buildx imagetools create \
@@ -304,16 +306,16 @@ jobs:
304306
run: |
305307
set -euo pipefail
306308
SANDBOXES='${{ needs.detect-changes.outputs.sandboxes }}'
307-
SHA="${{ github.sha }}"
309+
SHORT_SHA="${{ steps.repo.outputs.short_sha }}"
308310
309311
for SANDBOX in $(echo "$SANDBOXES" | jq -r '.[]'); do
310312
GHCR_IMAGE="${{ env.REGISTRY }}/${{ steps.repo.outputs.image_prefix }}/sandboxes/${SANDBOX}"
311313
ECR_IMAGE="${{ env.ECR_REGISTRY }}/${{ env.ECR_IMAGE_PREFIX }}/sandboxes/${SANDBOX}"
312314
313-
echo "Copying ${GHCR_IMAGE}:${SHA} -> ${ECR_IMAGE}:${SHA}"
315+
echo "Copying ${GHCR_IMAGE}:${SHORT_SHA} -> ${ECR_IMAGE}:${SHORT_SHA}"
314316
docker buildx imagetools create \
315-
-t "${ECR_IMAGE}:${SHA}" \
316-
"${GHCR_IMAGE}:${SHA}"
317+
-t "${ECR_IMAGE}:${SHORT_SHA}" \
318+
"${GHCR_IMAGE}:${SHORT_SHA}"
317319
318320
echo "Copying ${GHCR_IMAGE}:latest -> ${ECR_IMAGE}:latest"
319321
docker buildx imagetools create \

0 commit comments

Comments
 (0)