From 4ae851c0ae78a898526cac04da84d6653613c2f6 Mon Sep 17 00:00:00 2001
From: Bartek Wrona <wrona@syncad.com>
Date: Wed, 18 Oct 2023 19:13:48 +0200
Subject: [PATCH] emscripten sdk base image upgraded to 3.1.47 version
---
Dockerfile.emscripten | 3 ++-
docker-bake.hcl | 2 +-
scripts/bash/build_emscripten_image.sh | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Dockerfile.emscripten b/Dockerfile.emscripten
index 8c099aa..5f2b2d5 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 320dec0..d3566d5 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 e9fd356..b9a87dd 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}"
--
GitLab