Merge pull request #424 from mdh1418/wasm_emsdk_subdir

[wasm] Move emsdk to subdir so helix can write to its parent directory
dotnet · Mar 9, 2021 · f25f6cd · f25f6cd
2 parents 5a7c380 + 005aab4
commit f25f6cd
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/ubuntu/18.04/webassembly/Dockerfile b/src/ubuntu/18.04/webassembly/Dockerfile
@@ -17,13 +17,16 @@ RUN locale-gen en_US.UTF-8
 
 # Install Emscripten toolchain
 ENV EMSCRIPTEN_VERSION=2.0.12
-ENV EMSDK_PATH=/usr/local/emscripten
+ENV EMSCRIPTEN_PATH=/usr/local/emscripten
+ENV EMSDK_PATH=/usr/local/emscripten/emsdk
 
-RUN git clone https://github.com/emscripten-core/emsdk.git ${EMSDK_PATH} \
+RUN mkdir ${EMSCRIPTEN_PATH} \
+    && cd ${EMSCRIPTEN_PATH} \
+    && git clone https://github.com/emscripten-core/emsdk.git ${EMSDK_PATH} \
     && cd ${EMSDK_PATH} \
     && ./emsdk install ${EMSCRIPTEN_VERSION}-upstream \
     && ./emsdk activate ${EMSCRIPTEN_VERSION}-upstream \
-    && chmod -R 777 ${EMSDK_PATH}
+    && chmod -R 777 ${EMSCRIPTEN_PATH}
 
 # Install V8 Engine
 SHELL ["/bin/bash", "-c"]