Skip to content

Making instance redeploy external #465

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

Merged
tjmehta merged 4 commits into from
Jan 7, 2015
Merged

Making instance redeploy external #465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6187057
bump node in dockerfile and package.json
anandkumarpatel Dec 30, 2014
a796939
Merge pull request #456 from CodeNow/bump-node
tjmehta Dec 30, 2014
967c028
Merge remote-tracking branch 'origin/master'
Nathan219 Jan 7, 2015
059feea
Adding this back in
Nathan219 Jan 7, 2015
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
24 changes: 14 additions & 10 deletions docker-files/api_base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
#
# api_base Dockerfile
# Author anandkumarpatel
##
#

# Pull base image.
FROM registry.runnable.com/runnable/base:latest

WORKDIR /
# Node.js @ 10.28
$ npm @ 2.1.8

# install required packages
# lsof: required for open file monitoring

# Installing Node.js
RUN wget http://nodejs.org/dist/v0.10.29/node-v0.10.29.tar.gz
RUN tar xvf node-v*.tar.gz
WORKDIR node-v0.10.29/
RUN ./configure
RUN make -j16
RUN make install
RUN wget http://nodejs.org/dist/v0.10.28/node-v0.10.28.tar.gz \
&& tar xvf node-v*.tar.gz \
&& cd node-v0.10.28 \
&& ./configure \
&& make -j16 \
&& make install \
&& npm install -g npm@2.1.8 \
&& apt-get install lsof
6 changes: 3 additions & 3 deletions lib/routes/instances/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ var github = require('middlewares/apis').github;
var docker = require('middlewares/apis').docker;
var mavis = require('middlewares/apis').mavis;
var sauron = require('middlewares/apis').sauron;
var isInternal = require('middlewares/is-internal-request.js');
var runnable = require('middlewares/apis').runnable;
var hosts = require('middlewares/redis').hosts;
var userStoppedContainer = require('middlewares/redis').userStoppedContainer;
Expand Down Expand Up @@ -562,11 +561,12 @@ app.post('/instances/:id/actions/copy',
);

/** Creates a container (instance.container) from the current instance build (instance.build)
* @event PUT rest/instances/:id/a
- * @event PUT rest/instances/:id/a
+ * THIS IS ALSO USED INTERNALLY
+ * @event POST rest/instances/:id/actions/redeploy
* @params id: instance id
*/
app.post('/instances/:id/actions/redeploy',
isInternal,
findInstance,
flow.or(
me.isOwnerOf('instance'),
Expand Down
6 changes: 5 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,11 @@
"sauron": "git+ssh://git@github.com:codenow/sauron#v0.0.8",
"server-destroy": "^1.0.0"
},
"engine": "node >= 0.10.5",
"engineStrict": true,
"engine": {
"node" : "0.10.28",
"npm" : "2.1.8"
},
"scripts": {
"test-watch": "echo use 'bdd-watch' or 'unit-watch'",
"_bdd": "npm run clear; NODE_PATH=./lib NODE_ENV=test lab -v -l -m 200 -e test",
Expand Down