Skip to content

fix(preamble): use upstream preamble environment detection #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 10, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 3 additions & 22 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ojkwon/arch-nvm-node:7b0d30e-node8.4-npm5.4.1
FROM ojkwon/arch-nvm-node:6c538cc-node7.9-npm5.4.2
MAINTAINER OJ Kwon <kwon.ohjoong@gmail.com>

# Build time args
Expand All @@ -13,31 +13,12 @@ RUN pacman --noconfirm -S \
python \
python-setuptools \
python2-setuptools \
jre8-openjdk
# emscripten // disabled while installing pinned down version
jre8-openjdk \
emscripten

# Change subsequent execution shell to bash
SHELL ["/bin/bash", "-l", "-c"]

#START emscripten--------------------------------
# Install emscripten-1.37.18-1-x86_64.pkg.tar.xz
# until binaryen clang failure (https://github.com/WebAssembly/binaryen/issues/1164) resolved

RUN cd $TMPDIR && \
curl https://archive.archlinux.org/packages/e/emscripten/emscripten-1.37.18-1-x86_64.pkg.tar.xz > ./emscripten-1.37.18-1-x86_64.pkg.tar.xz && \
curl https://archive.archlinux.org/packages/e/emscripten/emscripten-1.37.18-1-x86_64.pkg.tar.xz.sig > ./emscripten-1.37.18-1-x86_64.pkg.tar.xz.sig && \
sudo pacman --noconfirm -U emscripten-1.37.18-1-x86_64.pkg.tar.xz

#END emscripten--------------------------------

#START preamble patch--------------------------------
# Patch preamble.js to support Electron's renderer process with node.js environment
# Refer https://github.com/kripken/emscripten/pull/5577 for detail.
# TODO: remove based on upstream PR status
COPY ./preamble.patch $TMPDIR/
RUN patch /usr/lib/emscripten/src/preamble.js $TMPDIR/preamble.patch
#END preamble patch--------------------------------

# Initialize emcc
RUN emcc

Expand Down
15 changes: 0 additions & 15 deletions preamble.patch

This file was deleted.