From bbdb1c6c00076937ab37c73592e66318fc0f723e Mon Sep 17 00:00:00 2001 From: David Banham Date: Wed, 1 Jun 2016 22:13:44 +1000 Subject: [PATCH 1/2] Upgrade to node 6 --- Dockerfile | 7 +++---- docker-compose.yml | 12 ++++++++++++ package.json | 3 ++- 3 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 docker-compose.yml diff --git a/Dockerfile b/Dockerfile index 84735c8..72862fb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,15 @@ -FROM nodesource/vivid:LTS +FROM node:6 MAINTAINER Prismatik Pty. Ltd. -RUN apt-get install -y git-core COPY ./package.json /opt/app/ WORKDIR /opt/app -RUN npm install +RUN NODE_ENV=null npm install RUN ln -s .. node_modules/root ADD . /opt/app/ EXPOSE 3000 -ENTRYPOINT ["node", "/opt/app/index.js"] +CMD npm start diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..285a871 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,12 @@ +version: '2' +services: + auth: + build: . + environment: + RETHINK_HOST: rethinkdb + depends_on: + - rethinkdb + links: + - rethinkdb + rethinkdb: + image: rethinkdb diff --git a/package.json b/package.json index 68ca537..a286c2c 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,8 @@ "main": "index.js", "scripts": { "test": "BLUEBIRD_WARNINGS=0 node test/index.js", - "start": "node index.js" + "start": "node index.js", + "dockertest": "docker-compose run auth npm test" }, "engines": { "node": "4.1.0" From 54e50817c78036e84bd2f30b861abd6b1b2bd807 Mon Sep 17 00:00:00 2001 From: David Banham Date: Wed, 1 Jun 2016 22:16:10 +1000 Subject: [PATCH 2/2] Update travis test targets --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1179211..00d98a8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,10 +7,8 @@ before_install: - sudo /etc/init.d/rethinkdb restart language: node_js node_js: - - "4.0" - - "4.1" - - "4.2" - "4" + - "6" env: - CXX=g++-4.8 addons: