From 162f8ab361e5238a3c591e40ce1b11b24795f6b2 Mon Sep 17 00:00:00 2001
From: Stephen Moloney <stephen@stephenmoloney.com>
Date: Thu, 27 Apr 2017 21:58:48 +0100
Subject: make METEOR_EDGE optional. Fix node_gyp bug in docker build.

- make METEOR_EDGE optional.
- Fix node_gyp bug in docker build.
- Cannot fix `npm install` because this
runs in the travis container and that is running
on an old ubuntu 12.0 - some way to get a newer version?
- remove npm install for now.
- possibly run tests against docker container
as alternative.
---
 .travis.yml |  8 +-------
 Dockerfile  | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 01d60165..45d8e1b3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,10 +18,4 @@ before_install:
 language: node_js
 
 node_js:
-  - "6.10.2"
-
-install:
-  - "npm install"
-
-script:
-  - "npm test"
+  - "4.8.1"
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index c3a1fe75..c834addc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,16 +5,18 @@ MAINTAINER wekan
 ARG NODE_VERSION
 ARG METEOR_RELEASE
 ARG METEOR_EDGE
+ARG USE_EDGE
 ARG NPM_VERSION
 ARG ARCHITECTURE
 ARG SRC_PATH
 
 # Set the environment variables (defaults where required)
-ENV BUILD_DEPS="wget curl bzip2 build-essential python git ca-certificates"
+ENV BUILD_DEPS="wget curl bzip2 build-essential python git ca-certificates gcc-4.9"
 ENV GOSU_VERSION=1.10
 ENV NODE_VERSION ${NODE_VERSION:-v4.8.1}
-ENV METEOR_RELEASE ${METEOR_RELEASE:-1.4.5}
-ENV METEOR_EDGE ${METEOR_EDGE:-1.4.4.1}
+ENV METEOR_RELEASE ${METEOR_RELEASE:-1.4.4.1}
+ENV USE_EDGE ${USE_EDGE:-false}
+ENV METEOR_EDGE ${METEOR_EDGE:-1.4.4-rc.6}
 ENV NPM_VERSION ${NPM_VERSION:-4.5.0}
 ENV ARCHITECTURE ${ARCHITECTURE:-linux-x64}
 ENV SRC_PATH ${SRC_PATH:-./}
@@ -76,18 +78,16 @@ RUN \
     sed -i "s|RELEASE=.*|RELEASE=${METEOR_RELEASE}\"\"|g" ./install_meteor.sh && \
     echo "Starting meteor ${METEOR_RELEASE} installation...   \n" && \
     chown wekan:wekan ./install_meteor.sh && \
-    ###########################
-    ###########################
-    # Block for ensuring installation of release candidates - perhaps remove later.
-    gosu wekan:wekan sh ./install_meteor.sh || \
-    ( \
+    \
+    # Check if opting for a release candidate instead of major release
+    if [ "$USE_EDGE" = false ]; then \
+      gosu wekan:wekan sh ./install_meteor.sh; \
+    else \
       gosu wekan:wekan git clone --recursive git://github.com/meteor/meteor.git /home/wekan/.meteor && \
       cd /home/wekan/.meteor && \
       gosu wekan:wekan git checkout release/METEOR@${METEOR_EDGE} && \
-      gosu wekan /home/wekan/.meteor/meteor -- help \
-    ) && \
-    ###########################
-    ###########################
+      gosu wekan /home/wekan/.meteor/meteor -- help; \
+    fi && \
     \
     # Build app
     cd /home/wekan/app && \
-- 
cgit v1.2.3-1-g7c22


From 4818199da7d5f4ca80c3fc29dabc0fa31a66b333 Mon Sep 17 00:00:00 2001
From: Stephen Moloney <stephen@stephenmoloney.com>
Date: Thu, 27 Apr 2017 23:29:03 +0100
Subject: temp block npm install

---
 .travis.yml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 45d8e1b3..ca76cab3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,13 @@ before_install:
   # ^^ Note - need to come up with some way of checking the output from docker run
   # that it was a success... perhaps the nodejs server can output a success message?
 
-language: node_js
-
-node_js:
-  - "4.8.1"
\ No newline at end of file
+#language: node_js
+#
+#node_js:
+#  - "4.8.1"
+#
+#install:
+#  - "npm install"
+#
+#script:
+#  - "npm test"
-- 
cgit v1.2.3-1-g7c22