diff --git a/Dockerfile.emscripten b/Dockerfile.emscripten index 8c099aab5f03e0393194cf1bb178886594a7a264..5f2b2d5508def02e535876eb073f6f6175250c8c 100644 --- a/Dockerfile.emscripten +++ b/Dockerfile.emscripten @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1.5 -ARG EMSCRIPTEN_VERSION=3.1.43 +ARG EMSCRIPTEN_VERSION=3.1.47 FROM emscripten/emsdk:${EMSCRIPTEN_VERSION} AS pure_emscripten_sdk @@ -11,6 +11,7 @@ RUN apt-get update && \ DEBIAN_FRONTEND=noniteractive apt-get install -y \ git \ jq \ + ninja-build \ autoconf \ libtool \ protobuf-compiler && \ diff --git a/docker-bake.hcl b/docker-bake.hcl index 320dec0e968512550afa2293a0ad7c2ef2d9052a..d3566d5c4b7b84d2526c00993a1362b0e0fabb95 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -1,7 +1,7 @@ variable "CI_REGISTRY_IMAGE" {} variable "CI_COMMIT_SHA" {} variable "EMSCRIPTEN_VERSION" { - default = "3.1.43" + default = "3.1.47" } variable "BOOST_VERSION_TAG" { default = null diff --git a/scripts/bash/build_emscripten_image.sh b/scripts/bash/build_emscripten_image.sh index e9fd3566a6f1b6c005bda9585faee8d006a4a6a5..b9a87dd95a27932912a82fd7b886c356fc3d205d 100755 --- a/scripts/bash/build_emscripten_image.sh +++ b/scripts/bash/build_emscripten_image.sh @@ -5,11 +5,11 @@ SCRIPTSDIR="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" SRCDIR="${SCRIPTSDIR}/../../" REGISTRY=${1:-"registry.gitlab.syncad.com/hive/common-ci-configuration/"} -EMSDK_VERSION=${1:-"3.1.43"} +EMSDK_VERSION=${1:-"3.1.47"} export DOCKER_BUILDKIT=1 docker build --target=emscripten_builder \ --build-arg "EMSCRIPTEN_VERSION=${EMSDK_VERSION}" \ - --tag "${REGISTRY}emsdk:3.1.43" \ + --tag "${REGISTRY}emsdk:${EMSDK_VERSION}" \ --file "${SRCDIR}/Dockerfile.emscripten" "${SRCDIR}"