admin/ci-emsdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correctly tag latest built docker image (#1635)

Browse Source 
Additionally removes the `alias` and `only_alias` arguments and adds a
single `tag` argument - this makes it clear about the tag being pushed
to.

Fixes: #1631
This commit is contained in:
Joshua T.
2025-11-28 01:02:52 +05:30
committed by GitHub
parent 753652fd30
commit 5a3430bbe3
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.circleci/config.yml
View File

@@ -238,7 +238,7 @@ jobs:
name: push image name: push image
command: | command: |
docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" docker login -u "$DOCKER_USER" -p "$DOCKER_PASS"
make -C ./docker version=${CIRCLE_TAG} alias=${CIRCLE_TAG}-x64 only_alias=true push make -C ./docker version=${CIRCLE_TAG} tag=${CIRCLE_TAG}-x64 push
publish-docker-image-arm64: publish-docker-image-arm64:
executor: linux_arm64 executor: linux_arm64
@@ -254,7 +254,7 @@ jobs:
name: push image name: push image
command: | command: |
docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" docker login -u "$DOCKER_USER" -p "$DOCKER_PASS"
make -C ./docker version=${CIRCLE_TAG} alias=${CIRCLE_TAG}-arm64 only_alias=true push make -C ./docker version=${CIRCLE_TAG} tag=${CIRCLE_TAG}-arm64 push
publish-docker-image-multiplatform: publish-docker-image-multiplatform:
executor: linux_arm64 executor: linux_arm64
@@ -264,7 +264,8 @@ jobs:
name: push image name: push image
command: | command: |
docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" docker login -u "$DOCKER_USER" -p "$DOCKER_PASS"
make -C ./docker version=${CIRCLE_TAG} alias="latest" push-multiplatform make -C ./docker version=${CIRCLE_TAG} tag=${CIRCLE_TAG} push-multiplatform
make -C ./docker version=${CIRCLE_TAG} tag="latest" push-multiplatform
test-bazel7-linux: test-bazel7-linux:
executor: ubuntu executor: ubuntu

18
docker/Makefile
View File

@@ -3,8 +3,7 @@
# Emscripten version to build: Should match the version that has been already released. # Emscripten version to build: Should match the version that has been already released.
# i.e.: 1.39.18 # i.e.: 1.39.18
version = version =
alias = tag =
only_alias =
image_name ?= emscripten/emsdk image_name ?= emscripten/emsdk
@@ -22,14 +21,13 @@ test: test_dockerimage.sh .TEST
docker run --rm -u `id -u`:`id -g` -w /emsdk/docker --net=host --entrypoint /bin/bash ${image_name}:${version} $< docker run --rm -u `id -u`:`id -g` -w /emsdk/docker --net=host --entrypoint /bin/bash ${image_name}:${version} $<
push: .TEST push: .TEST
ifndef only_alias ifdef tag
docker push ${image_name}:${version} docker tag ${image_name}:${version} ${image_name}:${tag}
endif docker push ${image_name}:${tag}
ifdef alias
docker tag ${image_name}:${version} ${image_name}:${alias}
docker push ${image_name}:${alias}
endif endif
push-multiplatform: .TEST push-multiplatform: .TEST
docker manifest create ${image_name}:${version} $(foreach platform,x64 arm64,--amend ${image_name}:${version}-$(platform)) ifdef tag
docker manifest push ${image_name}:${version} docker manifest create ${image_name}:${tag} $(foreach platform,x64 arm64,--amend ${image_name}:${version}-$(platform))
docker manifest push ${image_name}:${tag}
endif