Merge pull request #14 from JustAMan/patch-emscripten

Use patched emscripten so Octopus would work in Cordova

Dockerfile

@@ -22,15 +22,21 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         automake \
         autoconf \
         m4 \
-        gperf && \
-    pip install ply && \
+        gperf \
+        wget && \
     rm -rf /var/lib/apt/lists/*
 
+RUN pip install ply
+
 RUN git clone https://github.com/emscripten-core/emsdk.git && \
     cd emsdk && \
     ./emsdk install 1.39.11 && \
     ./emsdk activate 1.39.11
 
+# Patch emscripten; needed until https://github.com/emscripten-core/emscripten/pull/10846 is merged and released
+RUN wget https://raw.githubusercontent.com/emscripten-core/emscripten/d68250f1e6059168bd1f791921445527c7548e29/src/preamble.js -O /emsdk/upstream/emscripten/src/preamble.js && \
+    wget https://raw.githubusercontent.com/emscripten-core/emscripten/d68250f1e6059168bd1f791921445527c7548e29/src/URIUtils.js -O /emsdk/upstream/emscripten/src/URIUtils.js
+
 ENV PATH=$PATH:/emsdk:/emsdk/upstream/emscripten:/emsdk/node/12.9.1_64bit/bin
 WORKDIR /code
 CMD ["make"]