Merge pull request #1017 from stephenmoloney/devel-local

changes to travis.yml.

.eslintrc.json

@@ -125,7 +125,7 @@
     "Checklists": true,
     "Settings": true,
     "InvitationCodes": true,
-    "Winston":true
-    "JsonRoutes" : true
+    "Winston":true,
+    "JsonRoutes": true
   }
 }

.travis.yml

@@ -1,12 +1,17 @@
+dist: trusty
 sudo: required
 
 env:
-  DOCKER_COMPOSE_VERSION: 1.11.2
+  TRAVIS_DOCKER_COMPOSE_VERSION: 1.12.0
+  TRAVIS_NODE_VERSION: 4.8.1
+  TRAVIS_NPM_VERSION: 4.4.4
 
 before_install:
+  - sudo apt-get update -y
+  - 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 +20,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"

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:-./}

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]

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: