diff --git a/docker/Dockerfile.asmjs-unknown-emscripten b/docker/Dockerfile.asmjs-unknown-emscripten index 179954a3f..d91664604 100644 --- a/docker/Dockerfile.asmjs-unknown-emscripten +++ b/docker/Dockerfile.asmjs-unknown-emscripten @@ -9,7 +9,7 @@ RUN /cmake.sh COPY xargo.sh / RUN /xargo.sh -COPY --from=trzeci/emscripten:1.38.46-upstream /emsdk_portable /emsdk_portable +COPY --from=trzeci/emscripten:1.39.20-upstream /emsdk_portable /emsdk_portable ENV EMSDK /emsdk_portable ENV EMSCRIPTEN=${EMSDK}/emscripten/sdk diff --git a/docker/Dockerfile.wasm32-unknown-emscripten b/docker/Dockerfile.wasm32-unknown-emscripten index 7b0340faf..8aec8da97 100644 --- a/docker/Dockerfile.wasm32-unknown-emscripten +++ b/docker/Dockerfile.wasm32-unknown-emscripten @@ -9,7 +9,7 @@ RUN /cmake.sh COPY xargo.sh / RUN /xargo.sh -COPY --from=trzeci/emscripten:1.38.46-upstream /emsdk_portable /emsdk_portable +COPY --from=trzeci/emscripten:1.39.20-upstream /emsdk_portable /emsdk_portable ENV EMSDK /emsdk_portable ENV EMSCRIPTEN=${EMSDK}/emscripten/sdk @@ -27,5 +27,4 @@ RUN apt-get update && apt-get install --assume-yes --no-install-recommends \ libxml2 \ python -COPY node-wasm /usr/local/bin/ -ENV CARGO_TARGET_WASM32_UNKNOWN_EMSCRIPTEN_RUNNER=node-wasm +ENV CARGO_TARGET_WASM32_UNKNOWN_EMSCRIPTEN_RUNNER=node diff --git a/docker/node-wasm b/docker/node-wasm deleted file mode 100755 index 14ea7928e..000000000 --- a/docker/node-wasm +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/env bash - -set -e - -# Workaround for -# https://github.com/kripken/emscripten/issues/4542 - -# Consider a project with this structure: -# -# ├── src -# │   ├── bin -# │   │   └── prog.rs -# │   └── lib.rs -# ├── benches -# │   └── b.rs -# ├── examples -# │   └── a.rs -# └── tests -#     └── t.rs -# -# We expect that the artifacts will be generated in -# -# `target/wasm32-unknown-emscripten/{debug,release}/deps/` -# (for tests and benches) -# -# `target/wasm32-unknown-emscripten/{debug,release}/examples/` -# for examples -# -# `target/wasm32-unknown-emscripten/{debug,release}/` -# for main programs (`main.rs` and `bin/*.rs`) -# -# Because of https://github.com/kripken/emscripten/issues/4542 -# the script must be executed from where the dependencies are. - -path="$(dirname "${1}")" -file="$(basename "${1}")" -base="$(basename "${path}")" - -if [[ "${base}" != "deps" ]] && [[ "${base}" != "examples" ]]; then - # main programs requeries the artifacts in `${path}/deps` - cd "${path}/deps" - exec node "../${file}" -else - # all deps of tests, benches and examples are in `${path}` dir - cd "${path}" - exec node "${file}" -fi -