From 773adc1e8a0d4f884defe6e949f90387f0c8ce4b Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Wed, 26 May 2021 23:58:41 +0200 Subject: [PATCH] Update web-wasm to 2.0.22 Update web-wasm to 2.0.22 Signed-off-by: Bensuperpc --- web-wasm/Dockerfile.in | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/web-wasm/Dockerfile.in b/web-wasm/Dockerfile.in index af8af65..8bc85ba 100644 --- a/web-wasm/Dockerfile.in +++ b/web-wasm/Dockerfile.in @@ -1,4 +1,4 @@ -FROM emscripten/emsdk:2.0.15 +FROM emscripten/emsdk:2.0.16 MAINTAINER Matt McCormick "matt.mccormick@kitware.com" # Revert back to "/bin/sh" as default shell @@ -6,13 +6,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com" RUN rm /bin/sh && ln -s /bin/dash /bin/sh ARG DEBIAN_FRONTEND=noninteractive -ARG REPO=http://cdn-fastly.deb.debian.org RUN \ - bash -c "echo \"deb $REPO/debian buster main contrib non-free\" > /etc/apt/sources.list" && \ - bash -c "echo \"deb $REPO/debian buster-updates main contrib non-free\" >> /etc/apt/sources.list" && \ - bash -c "echo \"deb $REPO/debian-security buster/updates main\" >> /etc/apt/sources.list" && \ - bash -c "echo \"deb http://ftp.debian.org/debian buster-backports main\" >> /etc/apt/sources.list" && \ apt-get update --yes && \ apt-get install --no-install-recommends --yes \ automake \ @@ -35,8 +30,8 @@ RUN \ ncurses-dev \ pkg-config \ libtool \ - python \ - python-pip \ + python3 \ + python3-pip \ rsync \ sed \ ssh \ @@ -51,11 +46,13 @@ RUN \ && \ apt-get clean --yes +RUN ln -s /usr/bin/python3 /usr/bin/python + #include "common.dockcross" #include "common.docker" -ENV EMSCRIPTEN_VERSION 2.0.15 +ENV EMSCRIPTEN_VERSION 2.0.16 ENV PATH /emsdk:/emsdk/upstream/bin/:/emsdk/upstream/emscripten:${PATH} ENV CC=/emsdk/upstream/emscripten/emcc \