Merge branch 'dockcross:master' into update_openssh

Merge pull request #573 from bensuperpc/update-web-wasm
Update emscripten to 2.0.29
2025-06-18 00:49:25 +02:00 · 2021-09-01 01:58:25 +02:00 · 2021-09-01 01:57:22 +02:00 · 2021-08-31 22:19:41 +02:00 · 2021-08-31 22:00:48 +02:00
2 changed files with 3 additions and 3 deletions
--- a/imagefiles/build-and-install-openssh.sh
+++ b/imagefiles/build-and-install-openssh.sh
@ -2,7 +2,7 @@

 set -ex

-OPENSSH_ROOT=V_8_5_P1
+OPENSSH_ROOT=V_8_7_P1

 cd /usr/src
 curl --connect-timeout 20 \
--- a/web-wasm/Dockerfile.in
+++ b/web-wasm/Dockerfile.in
@ -1,4 +1,4 @@
-FROM emscripten/emsdk:2.0.27
+FROM emscripten/emsdk:2.0.29
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"

 # Revert back to "/bin/sh" as default shell
@ -52,7 +52,7 @@ RUN ln -s /usr/bin/python3 /usr/bin/python

 #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 CC=/emsdk/upstream/emscripten/emcc \
Author	SHA1	Message	Date
Bensuperpc	22aed58e56	Merge branch 'dockcross:master' into update_openssh	2021-09-01 01:58:25 +02:00
Bensuperpc	b456e8a0fa	Merge pull request #573 from bensuperpc/update-web-wasm Update emscripten to 2.0.29	2021-09-01 01:57:22 +02:00
Bensuperpc	71d4c783b1	Update openSSH to V_8_7_P1 Update openSSH to V_8_7_P1 Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-31 22:19:41 +02:00
Bensuperpc	7764b101d4	Update emscripten to 2.0.29 Update emscripten to 2.0.29 Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-31 22:00:48 +02:00