Merge pull request #18 from kwonoj/pin-emscripten

build(emscripten): pin version via env variable

Author: kwonoj

.travis.yml

@@ -7,6 +7,8 @@ services:
 env:
   global:
     - DOCKER_REPO='ojkwon/arch-emscripten'
+    - EMSCRIPTEN_VERSION=1.37.28
+    - PROTOBUF_VERSION=3.5.1.1
   matrix:
     - BUILD_TARGET='base'
     - BUILD_TARGET='protobuf'
@@ -20,7 +22,7 @@ script:
   # set docker tag based on last commit short sha.
   - DOCKER_TAG=$DOCKER_REPO:${COMMIT}-$BUILD_TARGET
   - tput setaf 2; echo building docker image tagged as $DOCKER_TAG
-  - sudo docker build --tag $DOCKER_TAG --build-arg BUILD_TARGET=$BUILD_TARGET --build-arg PROTOBUF_VERSION=3.5.1.1 .
+  - sudo docker build --tag $DOCKER_TAG --build-arg BUILD_TARGET=$BUILD_TARGET --build-arg PROTOBUF_VERSION=$PROTOBUF_VERSION --build-arg EMSCRIPTEN_VERSION=$EMSCRIPTEN_VERSION .
   - |
     if [[ ! -z "${TRAVIS_TAG}" ]]; then
       tput setaf 2; echo this build is tagged versioned build, pushing into registry

Dockerfile

@@ -4,6 +4,7 @@ MAINTAINER OJ Kwon <[email protected]>
 # Build time args
 ARG BUILD_TARGET=""
 ARG PROTOBUF_VERSION=""
+ARG EMSCRIPTEN_VERSION=""
 
 # Upgrade system
 RUN pacman --noconfirm -Syyu
@@ -14,14 +15,19 @@ RUN pacman --noconfirm -S \
   python \
   python-setuptools \
   python2-setuptools \
-  jre8-openjdk \
-  emscripten
+  jre8-openjdk
 
 # Change subsequent execution shell to bash
 SHELL ["/bin/bash", "-l", "-c"]
 
 USER builder
 
+# Install emcc
+RUN cd $TMPDIR && \
+  curl https://archive.archlinux.org/packages/e/emscripten/emscripten-$EMSCRIPTEN_VERSION-1-x86_64.pkg.tar.xz > ./emscripten-$EMSCRIPTEN_VERSION-1-x86_64.pkg.tar.xz && \
+  curl https://archive.archlinux.org/packages/e/emscripten/emscripten-$EMSCRIPTEN_VERSION-1-x86_64.pkg.tar.xz.sig > ./emscripten-$EMSCRIPTEN_VERSION-1-x86_64.pkg.tar.xz.sig && \
+  sudo pacman --noconfirm -U emscripten-$EMSCRIPTEN_VERSION-1-x86_64.pkg.tar.xz
+
 # Initialize emcc
 RUN emcc && emcc --version
 
@@ -38,9 +44,9 @@ RUN if [[ "${BUILD_TARGET}" == "protobuf" ]]; then \
       cd $TMPDIR/protobuf-wasm && git checkout v$PROTOBUF_VERSION && cp *.patch $TMPDIR/protobuf && \
       cd $TMPDIR/protobuf && git apply *.patch && \
       git status && \
-      sh autogen.sh && emconfigure ./configure && emmake make && \
+      sh autogen.sh && emconfigure ./configure CXXFLAGS="-O2" && emmake make && \
       cp -r ./src/.libs $TMPDIR/ && \
-      ls $TMPDIR/.libs; \
+      ls -al $TMPDIR/.libs; \
     fi
 
 # trigger dummy build to cache corresponding binaryen port for wasm