web-wasm: Bump Emscripten to 1.38.24

Use Debian stretch packaged gosu, as recommended in the documentation:

  https://github.com/tianon/gosu/blob/master/INSTALL.md

to avoid GPG key issues.
This commit is contained in:
Matt McCormick 2019-01-20 12:59:32 -05:00
parent d9412b3136
commit 44e87d7cf2
No known key found for this signature in database
GPG Key ID: 45DA982347954FA5
2 changed files with 64 additions and 1 deletions

View File

@ -5,7 +5,54 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
# See https://github.com/asRIA/emscripten-docker/blob/master/Dockerfile.in#L4 # See https://github.com/asRIA/emscripten-docker/blob/master/Dockerfile.in#L4
RUN rm /bin/sh && ln -s /bin/dash /bin/sh 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" #include "common.docker"

16
web-wasm/install-gosu-sudo.sh Executable file
View File

@ -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