Skip to content
Snippets Groups Projects
Commit 4ae851c0 authored by Bartek Wrona's avatar Bartek Wrona
Browse files

emscripten sdk base image upgraded to 3.1.47 version

parent b09f45f7
No related branches found
No related tags found
1 merge request!28emscripten sdk base image upgraded to 3.1.47 version
Pipeline #77712 passed
# syntax=docker/dockerfile: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 FROM emscripten/emsdk:${EMSCRIPTEN_VERSION} AS pure_emscripten_sdk
...@@ -11,6 +11,7 @@ RUN apt-get update && \ ...@@ -11,6 +11,7 @@ RUN apt-get update && \
DEBIAN_FRONTEND=noniteractive apt-get install -y \ DEBIAN_FRONTEND=noniteractive apt-get install -y \
git \ git \
jq \ jq \
ninja-build \
autoconf \ autoconf \
libtool \ libtool \
protobuf-compiler && \ protobuf-compiler && \
......
variable "CI_REGISTRY_IMAGE" {} variable "CI_REGISTRY_IMAGE" {}
variable "CI_COMMIT_SHA" {} variable "CI_COMMIT_SHA" {}
variable "EMSCRIPTEN_VERSION" { variable "EMSCRIPTEN_VERSION" {
default = "3.1.43" default = "3.1.47"
} }
variable "BOOST_VERSION_TAG" { variable "BOOST_VERSION_TAG" {
default = null default = null
......
...@@ -5,11 +5,11 @@ SCRIPTSDIR="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" ...@@ -5,11 +5,11 @@ SCRIPTSDIR="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
SRCDIR="${SCRIPTSDIR}/../../" SRCDIR="${SCRIPTSDIR}/../../"
REGISTRY=${1:-"registry.gitlab.syncad.com/hive/common-ci-configuration/"} 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 export DOCKER_BUILDKIT=1
docker build --target=emscripten_builder \ docker build --target=emscripten_builder \
--build-arg "EMSCRIPTEN_VERSION=${EMSDK_VERSION}" \ --build-arg "EMSCRIPTEN_VERSION=${EMSDK_VERSION}" \
--tag "${REGISTRY}emsdk:3.1.43" \ --tag "${REGISTRY}emsdk:${EMSDK_VERSION}" \
--file "${SRCDIR}/Dockerfile.emscripten" "${SRCDIR}" --file "${SRCDIR}/Dockerfile.emscripten" "${SRCDIR}"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment