Skip to content

Node6 #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
davidbanham wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Node6 #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbdb1c6
Upgrade to node 6
davidbanham Jun 1, 2016
54e5081
Update travis test targets
davidbanham Jun 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 3 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
FROM nodesource/vivid:LTS
FROM node:6
MAINTAINER Prismatik Pty. Ltd. <david@prismatik.com.au>

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
12 changes: 12 additions & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
version: '2'
services:
auth:
build: .
environment:
RETHINK_HOST: rethinkdb
depends_on:
- rethinkdb
links:
- rethinkdb
rethinkdb:
image: rethinkdb
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down