Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2025-01-22 22:25:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #183 from thewtex/emscripten

Browse Source 
browser-asmjs: Bump Emscripten version and address cache permissions
This commit is contained in:
Matt McCormick 2018-01-18 16:11:45 -05:00 committed by GitHub
commit fab99c574e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
browser-asmjs/Dockerfile.in
View File

@ -1,4 +1,4 @@
FROM trzeci/emscripten:sdk-tag-1.37.21-64bit FROM trzeci/emscripten:sdk-tag-1.37.28-64bit
MAINTAINER Matt McCormick "matt.mccormick@kitware.com" MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
# Revert back to "/bin/sh" as default shell # Revert back to "/bin/sh" as default shell
@ -9,7 +9,7 @@ RUN rm /bin/sh && ln -s /bin/dash /bin/sh
#include "common.docker" #include "common.docker"
ENV EMSCRIPTEN_VERSION 1.37.21 ENV EMSCRIPTEN_VERSION 1.37.28
ENV PATH /emsdk_portable:/emsdk_portable/llvm/clang/bin/:/emsdk_portable/sdk/:${PATH} ENV PATH /emsdk_portable:/emsdk_portable/llvm/clang/bin/:/emsdk_portable/sdk/:${PATH}
ENV CC=/emsdk_portable/sdk/emcc \ ENV CC=/emsdk_portable/sdk/emcc \
@ -20,8 +20,7 @@ ENV DEFAULT_DOCKCROSS_IMAGE dockcross/browser-asmjs
ENV CMAKE_TOOLCHAIN_FILE /emsdk_portable/sdk/cmake/Modules/Platform/Emscripten.cmake ENV CMAKE_TOOLCHAIN_FILE /emsdk_portable/sdk/cmake/Modules/Platform/Emscripten.cmake
RUN chmod 777 /emsdk_portable/.cache* RUN mkdir -p /emsdk_portable/.cache && chmod -R 777 /emsdk_portable/.cache*
# Build-time metadata as defined at http://label-schema.org # Build-time metadata as defined at http://label-schema.org
ARG BUILD_DATE ARG BUILD_DATE