Merge pull request #292 from thewtex/wasm-bump

Wasm bump

README.rst

@@ -103,12 +103,6 @@ dockcross/android-arm64
   |android-arm64-images| The Android NDK standalone toolchain for the arm64
   architecture.
 
-.. |web-wasm-images| image:: https://images.microbadger.com/badges/image/dockcross/web-wasm.svg
-  :target: https://microbadger.com/images/dockcross/web-wasm
-
-dockcross/web-wasm
-  |web-wasm-images| The Emscripten WebAssembly/asm.js/JavaScript cross compiler.
-
 
 .. |linux-arm64-images| image:: https://images.microbadger.com/badges/image/dockcross/linux-arm64.svg
   :target: https://microbadger.com/images/dockcross/linux-arm64
@@ -197,6 +191,13 @@ dockcross/manylinux-x86
   Also has support for the dockcross script, and it has installations of CMake, Ninja, and `scikit-build <http://scikit-build.org>`_
 
 
+.. |web-wasm-images| image:: https://images.microbadger.com/badges/image/dockcross/web-wasm.svg
+  :target: https://microbadger.com/images/dockcross/web-wasm
+
+dockcross/web-wasm
+  |web-wasm-images| The Emscripten WebAssembly/asm.js/JavaScript cross compiler.
+
+
 .. |windows-x64-images| image:: https://images.microbadger.com/badges/image/dockcross/windows-x64.svg
   :target: https://microbadger.com/images/dockcross/windows-x64
 

web-wasm/Dockerfile.in

@@ -1,15 +1,62 @@
-FROM trzeci/emscripten-slim:sdk-tag-1.37.37-64bit
+FROM trzeci/emscripten-slim:sdk-tag-1.38.24-64bit
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # Revert back to "/bin/sh" as default shell
 # See https://github.com/asRIA/emscripten-docker/blob/master/Dockerfile.in#L4
 RUN rm /bin/sh && ln -s /bin/dash /bin/sh
 
-#include "common.debian"
+COPY install-gosu-sudo.sh /buildscripts/
+
+ARG DEBIAN_FRONTEND=noninteractive
+ARG REPO=http://cdn-fastly.deb.debian.org
+
+RUN \
+  bash -c "echo \"deb $REPO/debian stretch main contrib non-free\" > /etc/apt/sources.list"  && \
+  bash -c "echo \"deb $REPO/debian stretch-updates main contrib non-free\" >> /etc/apt/sources.list"  && \
+  bash -c "echo \"deb $REPO/debian-security stretch/updates main\" >> /etc/apt/sources.list" && \
+  bash -c "echo \"deb http://ftp.debian.org/debian stretch-backports main\" >> /etc/apt/sources.list" && \
+  apt-get update --yes && \
+  apt-get install --no-install-recommends --yes \
+    automake \
+    autogen \
+    bash \
+    build-essential \
+    bc \
+    bzip2 \
+    ca-certificates \
+    curl \
+    dirmngr \
+    file \
+    gettext \
+    gnupg2 \
+    gosu \
+    gzip \
+    zip \
+    make \
+    ncurses-dev \
+    pkg-config \
+    libtool \
+    python \
+    python-pip \
+    rsync \
+    sed \
+    ssh \
+    bison \
+    flex \
+    tar \
+    pax \
+    vim \
+    wget \
+    xz-utils \
+    zlib1g-dev \
+  && \
+  apt-get clean --yes && \
+  /buildscripts/install-gosu-sudo.sh && \
+  rm -rf /buildscripts
 
 #include "common.docker"
 
-ENV EMSCRIPTEN_VERSION 1.37.37
+ENV EMSCRIPTEN_VERSION 1.38.24
 
 ENV PATH /emsdk_portable:/emsdk_portable/llvm/clang/bin/:/emsdk_portable/sdk/:${PATH}
 ENV CC=/emsdk_portable/sdk/emcc \

web-wasm/install-gosu-sudo.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+# verify that the binary works
+gosu nobody true
+
+
+cat << EOF >> /usr/bin/sudo
+#!/bin/sh
+
+# Emulate the sudo command
+
+exec gosu root:root "\$@"
+
+EOF
+
+chmod +x /usr/bin/sudo