From fada94d93b007331a95e825d2eaf2313df0b07aa Mon Sep 17 00:00:00 2001 From: "3dsgitasw@gmail.com" <3dsgitasw@gmail.com> Date: Sun, 10 May 2020 19:24:09 -0700 Subject: [PATCH] Fix emsdk install and PATH update --- Dockerfile | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index a4344f26..d19c5fcb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,16 +21,14 @@ RUN wget \ dpkg -i qemu.deb && \ rm qemu.deb -RUN cd /tmp && \ - git clone https://github.com/emscripten-core/emsdk.git && \ - cd emsdk && \ - ./emsdk install latest && \ - cd .. && \ - rm -rf emsdk +RUN git clone --depth 1 https://github.com/emscripten-core/emsdk.git && \ + ./emsdk/emsdk install latest && \ + ./emsdk/emsdk activate latest && \ + ln -s $(ls -d -1 /emsdk/node/**) /emsdk/node/latest RUN mkdir /sm64 WORKDIR /sm64 -ENV PATH="/sm64/tools:/emsdk:${PATH}" +ENV PATH="/sm64/tools:/emsdk:/emsdk/node/latest/bin:/emsdk/upstream/emscripten:${PATH}" CMD echo 'usage: docker run --rm --mount type=bind,source="$(pwd)",destination=/sm64 sm64 make VERSION=${VERSION:-us} -j4\n' \ 'see https://github.com/n64decomp/sm64/blob/master/README.md for advanced usage'