From a323ba557419a03c4c2a0abe1255d7b534f17241 Mon Sep 17 00:00:00 2001
From: Bartek Wrona <wrona@syncad.com>
Date: Fri, 7 Mar 2025 21:24:53 +0100
Subject: [PATCH] Updated emsdk docker image tag
---
docker-bake.hcl | 2 +-
scripts/bash/build_emscripten_image.sh | 3 ++-
templates/npm_projects.gitlab-ci.yml | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 6be5818..7d33720 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -83,7 +83,7 @@ target "tox-test-runner" {
target "emsdk" {
dockerfile = "Dockerfile.emscripten"
- tags = generate-tags("emsdk", "${EMSCRIPTEN_VERSION}-2")
+ tags = generate-tags("emsdk", "${EMSCRIPTEN_VERSION}-3")
cache-from = generate-cache-from("emsdk", "${EMSCRIPTEN_VERSION}")
cache-to = generate-cache-to("emsdk", "${EMSCRIPTEN_VERSION}")
args = {
diff --git a/scripts/bash/build_emscripten_image.sh b/scripts/bash/build_emscripten_image.sh
index abb3eb3..b48e89e 100755
--- a/scripts/bash/build_emscripten_image.sh
+++ b/scripts/bash/build_emscripten_image.sh
@@ -10,6 +10,7 @@ EMSDK_VERSION=${1:-"4.0.1"}
export DOCKER_BUILDKIT=1
docker build --target=supplemented_emscripten_builder \
+ --progress=plain \
--build-arg "EMSCRIPTEN_VERSION=${EMSDK_VERSION}" \
- --tag "${REGISTRY}emsdk:${EMSDK_VERSION}-2" \
+ --tag "${REGISTRY}emsdk:${EMSDK_VERSION}-3" \
--file "${SRCDIR}/Dockerfile.emscripten" "${SRCDIR}"
diff --git a/templates/npm_projects.gitlab-ci.yml b/templates/npm_projects.gitlab-ci.yml
index 981118e..360008e 100644
--- a/templates/npm_projects.gitlab-ci.yml
+++ b/templates/npm_projects.gitlab-ci.yml
@@ -2,8 +2,8 @@ include:
- local: templates/base.gitlab-ci.yml
variables:
- # uses registry.gitlab.syncad.com/hive/common-ci-configuration/emsdk:4.0.1-2
- EMSCRIPTEN_IMAGE_TAG: "4.0.1-2@sha256:a63a3ed761ce99ec858855bbdaf1cda03e383635dd7e88754010a746f7fd2cb3"
+ # uses registry.gitlab.syncad.com/hive/common-ci-configuration/emsdk:4.0.1-3
+ EMSCRIPTEN_IMAGE_TAG: "4.0.1-3@sha256:a2aef5aee0c4bcf1655cd9388d9d940ebfe588c66dae12d0abf5e21a6aff6f0d"
EMSCRIPTEN_IMAGE: "registry.gitlab.syncad.com/hive/common-ci-configuration/emsdk:$EMSCRIPTEN_IMAGE_TAG"
.node_based_job_base:
--
GitLab