Mercurial > hg > orthanc-stone
diff Applications/StoneWebViewer/WebAssembly/docker-build.sh @ 1827:21ccc00839f7 StoneWebViewer-2.0
upgrade to Emscripten 2.0.23
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 27 May 2021 11:05:59 +0200 |
parents | 9ac2a65d4172 |
children | 3889ae96d2e9 |
line wrap: on
line diff
--- a/Applications/StoneWebViewer/WebAssembly/docker-build.sh Thu May 27 09:11:36 2021 +0200 +++ b/Applications/StoneWebViewer/WebAssembly/docker-build.sh Thu May 27 11:05:59 2021 +0200 @@ -21,7 +21,9 @@ set -ex -IMAGE=jodogne/wasm-builder:1.39.17-upstream +# NB: Sources of the "jodogne/wasm-builder" Docker image: +# https://github.com/jodogne/OrthancDocker/tree/master/wasm-builder +IMAGE=jodogne/wasm-builder:2.0.23 #IMAGE=wasm-builder if [ "$1" != "Debug" -a "$1" != "Release" ]; then @@ -29,6 +31,14 @@ exit -1 fi +if [ "$2" == "" ]; then + echo "No branch provided, trying to identify the current branch" + STONE_BRANCH=`hg identify -b` + echo "Detected branch of the Stone Web viewer: ${STONE_BRANCH}" +else + STONE_BRANCH=$2 +fi + if [ -t 1 ]; then # TTY is available => use interactive mode DOCKER_FLAGS='-i' @@ -40,6 +50,7 @@ docker run -t ${DOCKER_FLAGS} --rm \ --user $(id -u):$(id -g) \ + -e STONE_BRANCH=${STONE_BRANCH} \ -v ${ROOT_DIR}:/source:ro \ -v ${ROOT_DIR}/wasm-binaries:/target:rw ${IMAGE} \ bash /source/Applications/StoneWebViewer/WebAssembly/docker-internal.sh $1