From 42ba5e84ddf740d978a5b63ec07226d841801969 Mon Sep 17 00:00:00 2001 From: Kris Williams Date: Fri, 26 Dec 2014 14:32:29 -0800 Subject: [PATCH 1/2] Update stable to Node 0.10.35, Add latest-sails-experimental option for sails canary release --- README.md | 4 +++- {node-0.10.34 => node-0.10.35}/Dockerfile | 0 .../Dockerfile | 0 node-latest-sails-edge/Dockerfile | 19 +++++++++++++++++++ 4 files changed, 22 insertions(+), 1 deletion(-) rename {node-0.10.34 => node-0.10.35}/Dockerfile (100%) rename {node-0.10.34-pm2 => node-10.35-pm2}/Dockerfile (100%) create mode 100644 node-latest-sails-edge/Dockerfile diff --git a/README.md b/README.md index e8f59ac..406534a 100644 --- 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. \ No newline at end of file +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. \ No newline at end of file diff --git a/node-0.10.34/Dockerfile b/node-0.10.35/Dockerfile similarity index 100% rename from node-0.10.34/Dockerfile rename to node-0.10.35/Dockerfile diff --git a/node-0.10.34-pm2/Dockerfile b/node-10.35-pm2/Dockerfile similarity index 100% rename from node-0.10.34-pm2/Dockerfile rename to node-10.35-pm2/Dockerfile diff --git a/node-latest-sails-edge/Dockerfile b/node-latest-sails-edge/Dockerfile new file mode 100644 index 0000000..668ff4e --- /dev/null +++ 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 + +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 \ No newline at end of file From a8ef593aef2ad48b52a738964e1d06226523f267 Mon Sep 17 00:00:00 2001 From: Kris Williams Date: Fri, 26 Dec 2014 14:43:14 -0800 Subject: [PATCH 2/2] node 0.10.34 -> 0.10.35 Forgot the FROM reference --- node-0.10.35/Dockerfile | 2 +- node-10.35-pm2/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/node-0.10.35/Dockerfile b/node-0.10.35/Dockerfile index c9a000b..03b8bfa 100644 --- a/node-0.10.35/Dockerfile +++ b/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 diff --git a/node-10.35-pm2/Dockerfile b/node-10.35-pm2/Dockerfile index bd6deca..9110768 100644 --- a/node-10.35-pm2/Dockerfile +++ b/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