mirror of
https://github.com/bensuperpc/dockcross.git
synced 2024-12-22 16:24:27 +01:00
Merge branch 'dockcross:master' into update_openssh
This commit is contained in:
commit
22aed58e56
@ -1,4 +1,4 @@
|
|||||||
FROM emscripten/emsdk:2.0.27
|
FROM emscripten/emsdk:2.0.29
|
||||||
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
|
||||||
@ -52,7 +52,7 @@ RUN ln -s /usr/bin/python3 /usr/bin/python
|
|||||||
|
|
||||||
#include "common.docker"
|
#include "common.docker"
|
||||||
|
|
||||||
ENV EMSCRIPTEN_VERSION 2.0.27
|
ENV EMSCRIPTEN_VERSION 2.0.29
|
||||||
|
|
||||||
ENV PATH /emsdk:/emsdk/upstream/bin/:/emsdk/upstream/emscripten:${PATH}
|
ENV PATH /emsdk:/emsdk/upstream/bin/:/emsdk/upstream/emscripten:${PATH}
|
||||||
ENV CC=/emsdk/upstream/emscripten/emcc \
|
ENV CC=/emsdk/upstream/emscripten/emcc \
|
||||||
|
Loading…
Reference in New Issue
Block a user