From 3154e8729b5c7677bc00e517cac5c7a14ccf31aa Mon Sep 17 00:00:00 2001
From: Stephen Moloney <stephen@stephenmoloney.com>
Date: Fri, 28 Apr 2017 10:36:44 +0100
Subject: [PATCH 1/3] changes to travis.yml.

- Add gcc-4.9 to travis host.
- namespace travis variables as seem to conflict with docker env.
- set versions on travis.
- run npm tests again.
- slight readme mod for docker
---
 .eslintrc.json |  4 ++--
 .travis.yml    | 31 +++++++++++++++++++------------
 Dockerfile     |  2 +-
 README.md      |  4 ++--
 4 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 0e2fd4952..7aa16f4dc 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -125,7 +125,7 @@
     "Checklists": true,
     "Settings": true,
     "InvitationCodes": true,
-    "Winston":true
-    "JsonRoutes" : true
+    "Winston":true,
+    "JsonRoutes": true
   }
 }
diff --git a/.travis.yml b/.travis.yml
index ca76cab31..77a8af185 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,19 @@
+dist: trusty
 sudo: required
 
 env:
-  DOCKER_COMPOSE_VERSION: 1.11.2
+  TRAVIS_DOCKER_COMPOSE_VERSION: 1.12.0
+  TRAVIS_GCC_VERSION: 4.9
+  TRAVIS_NODE_VERSION: 4.8.1
+  TRAVIS_NPM_VERSION: 4.4.4
 
 before_install:
+  - sudo apt-get update -y
+  - sudo apt-get install -y gcc-${TRAVIS_GCC_VERSION}
+  - npm install -g npm@${TRAVIS_NPM_VERSION}
   - sudo curl -fsSL https://get.docker.com/ | sh
   - if [ -e /usr/local/bin/docker-compose ]; then sudo rm /usr/local/bin/docker-compose; fi
-  - sudo curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
+  - sudo curl -L https://github.com/docker/compose/releases/download/${TRAVIS_DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
   - sudo chmod +x docker-compose
   - sudo mv docker-compose /usr/local/bin
   - sudo docker-compose build --no-cache --force-rm
@@ -15,13 +22,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"
-#
-#install:
-#  - "npm install"
-#
-#script:
-#  - "npm test"
+language: node_js
+
+node_js:
+  - "${TRAVIS_NODE_VERSION}"
+
+install:
+  - "npm install"
+
+script:
+  - "npm test"
diff --git a/Dockerfile b/Dockerfile
index c834addcf..7023b6fc4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@ ENV GOSU_VERSION=1.10
 ENV NODE_VERSION ${NODE_VERSION:-v4.8.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 METEOR_EDGE ${METEOR_EDGE:-1.5-beta.17}
 ENV NPM_VERSION ${NPM_VERSION:-4.5.0}
 ENV ARCHITECTURE ${ARCHITECTURE:-linux-x64}
 ENV SRC_PATH ${SRC_PATH:-./}
diff --git a/README.md b/README.md
index 799ef0bc9..e423729a8 100644
--- a/README.md
+++ b/README.md
@@ -85,8 +85,6 @@ First registered Wekan user will get [Admin Panel][features] on new
 Docker and source based installs. You can also                            
 [enable Admin Panel manually][enable_adminpanel].
 
-[Docker](https://github.com/wekan/wekan/wiki/Docker)
-
 [![Deploy][heroku_button]][heroku_deploy]
 [![SignUp][indiehosters_button]][indiehosters_saas]
 [![Deploy to Scalingo][scalingo_button]][scalingo_deploy]
@@ -95,6 +93,8 @@ Docker and source based installs. You can also
 
 [VirtualBox][virtualbox]
 
+[Install via Docker](https://github.com/wekan/wekan/wiki/Docker)
+
 [Install from source][install_source]
 
 [Install from source on Windows][installsource_windows]

From 6d45836b4d7cbff4be2c657d3d9a2f9eeac727bf Mon Sep 17 00:00:00 2001
From: Stephen Moloney <stephen@stephenmoloney.com>
Date: Fri, 28 Apr 2017 10:59:38 +0100
Subject: [PATCH 2/3] add new ARGS to docker-compose

---
 docker-compose.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 263d93470..e3cad937a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,6 +30,8 @@ services:
         - NPM_VERSION=${NPM_VERSION}
         - ARCHITECTURE=${ARCHITECTURE}
         - SRC_PATH=${SRC_PATH}
+        - METEOR_EDGE=${METEOR_EDGE}
+        - USE_EDGE=${USE_EDGE}
     ports:
       - 80:80
     environment:

From c5a738ba0a378b695d4c1e66516d2760336a7f13 Mon Sep 17 00:00:00 2001
From: Stephen Moloney <stephen@stephenmoloney.com>
Date: Fri, 28 Apr 2017 11:05:28 +0100
Subject: [PATCH 3/3] gcc already newer version since using trusty now and not
 precise

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 77a8af185..1bdc5b250 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,13 +3,11 @@ sudo: required
 
 env:
   TRAVIS_DOCKER_COMPOSE_VERSION: 1.12.0
-  TRAVIS_GCC_VERSION: 4.9
   TRAVIS_NODE_VERSION: 4.8.1
   TRAVIS_NPM_VERSION: 4.4.4
 
 before_install:
   - sudo apt-get update -y
-  - sudo apt-get install -y gcc-${TRAVIS_GCC_VERSION}
   - npm install -g npm@${TRAVIS_NPM_VERSION}
   - sudo curl -fsSL https://get.docker.com/ | sh
   - if [ -e /usr/local/bin/docker-compose ]; then sudo rm /usr/local/bin/docker-compose; fi