Merge pull request #2 from kriswill/feature/node-0.10.35

Update stable to Node 0.10.35, Add latest-sails-experimental option
artificialio · Dec 27, 2014 · 92a5238 · 92a5238
2 parents 10c870d + a8ef593
commit 92a5238
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -3,4 +3,6 @@ Docker-sails
 
 This Docker Container is based on /~https://github.com/docker-library/node and installs the latest stable version of [Sails.js](http://sailsjs.org/) and is used with the [Sane Stack](/~https://github.com/artificialio/sane).
 
-You have the docker tags `0.10.32` (fixed versions), `latest` (node 0.11 and latest dependencies), `stable` (node 0.10  and latest dependencies) as well as `0.10.32-pm2`, `latest-pm2` , `stable-pm2` which adds [PM2](/~https://github.com/Unitech/PM2) to manage your app.
+You have the docker tags `0.10.35` (fixed versions), `latest` (node 0.11 and latest dependencies), `stable` (node 0.10  and latest dependencies) as well as `0.10.35-pm2`, `latest-pm2` , `stable-pm2` which adds [PM2](/~https://github.com/Unitech/PM2) to manage your app.
+
+`latest-sails-edge` tracks the canary release candidate for [Sails.js](http://sailsjs.org), currently at [rc4](/~https://github.com/balderdashy/sails/tree/v0.11.0-rc4), running on node 0.11.
diff --git a/node-0.10.34/Dockerfile → node-0.10.35/Dockerfile b/node-0.10.34/Dockerfile → node-0.10.35/Dockerfile
@@ -2,7 +2,7 @@
 # Dockerfile for Sane-stack to run sails.js API application
 ############################################################
 
-FROM node:0.10.34-slim
+FROM node:0.10.35-slim
 
 MAINTAINER Markus Padourek <markus@artificial.io>
 

diff --git a/node-0.10.34-pm2/Dockerfile → node-10.35-pm2/Dockerfile b/node-0.10.34-pm2/Dockerfile → node-10.35-pm2/Dockerfile
@@ -2,7 +2,7 @@
 # Dockerfile for Sane-stack to run sails.js API application
 ############################################################
 
-FROM node:0.10.34-slim
+FROM node:0.10.35-slim
 
 MAINTAINER Markus Padourek <markus@artificial.io>
 

diff --git a/node-latest-sails-edge/Dockerfile b/node-latest-sails-edge/Dockerfile
@@ -0,0 +1,19 @@
+############################################################
+# Dockerfile for Sane-stack to run sails.js API application
+############################################################
+
+FROM node:0.11-slim
+
+MAINTAINER Markus Padourek <markus@artificial.io>
+
+RUN npm install -g sails@v0.11.0-rc4 grunt bower pm2 npm-check-updates
+RUN mkdir /server
+
+# Define mountable directories.
+VOLUME ["/server"]
+
+# Define working directory.
+WORKDIR /server
+
+# Expose ports.
+EXPOSE 1337