docker-activator
Advanced tools
Comparing version 0.0.2 to 0.0.3
@@ -64,4 +64,3 @@ var Docker = require('dockerode'), | ||
getContainerStatus(containerName, function(err2, data) { | ||
console.log('container status', containerName, err2, data); | ||
callback(err2, data.ipaddr); | ||
callback(err2, { ipaddr: data.ipaddr }); | ||
}); | ||
@@ -99,19 +98,8 @@ } | ||
function dockerStart(containerName, callback) { | ||
docker.getContainer(containerName, function(err1, container) { | ||
if (err1) { | ||
callback(err1); | ||
} else { | ||
startContainer(container, containerName, callback); | ||
} | ||
}); | ||
} | ||
function ensureStarted(options, callback) { | ||
var container; | ||
if (stoppingContainerWaiters[options.createOptions.name]) { | ||
stoppingContainerWaiters[options.createOptions.name].push(callback); | ||
console.log('ensureStarted - container is stopping!'); | ||
} else { | ||
getContainerStatus(options.createOptions.name, function(err, containerStatus) { | ||
console.log('ensureStarted - container status', options.createOptions.name, err, containerStatus); | ||
if (err) { | ||
@@ -122,3 +110,4 @@ callback(err); | ||
} else if (containerStatus.exists) { | ||
dockerStart(options.createOptions.name, callback); | ||
container = docker.getContainer(options.createOptions.name); | ||
startContainer(container, options.createOptions.name, callback); | ||
} else { | ||
@@ -125,0 +114,0 @@ createAndStart(options, callback); |
@@ -7,3 +7,3 @@ { | ||
}, | ||
"version": "0.0.2", | ||
"version": "0.0.3", | ||
"dependencies": { | ||
@@ -24,4 +24,2 @@ "dockerode": "*" | ||
"main": "index.js", | ||
"readme": "# docker-activator\nensure a Docker container is started (for use in socket activation proxies)\n", | ||
"readmeFilename": "README.md", | ||
"gitHead": "75b438c36ed5af50fe13581b9112539e0cc4bb02", | ||
@@ -33,5 +31,23 @@ "description": "ensure a Docker container is started (for use in socket activation proxies)", | ||
"homepage": "https://github.com/michielbdejong/docker-activator", | ||
"_id": "docker-activator@0.0.1", | ||
"_shasum": "221980c7f3c717a75d502dc8c982428ca2b62f3d", | ||
"_from": "docker-activator@*" | ||
"_id": "docker-activator@0.0.2", | ||
"_shasum": "c3b4800acb6b6ea19fea832a02fa772ae8f93db7", | ||
"_from": "docker-activator@", | ||
"_npmVersion": "1.4.21", | ||
"_npmUser": { | ||
"name": "michielbdejong", | ||
"email": "michiel@unhosted.org" | ||
}, | ||
"maintainers": [ | ||
{ | ||
"name": "michielbdejong", | ||
"email": "michiel@unhosted.org" | ||
} | ||
], | ||
"dist": { | ||
"shasum": "c3b4800acb6b6ea19fea832a02fa772ae8f93db7", | ||
"tarball": "http://registry.npmjs.org/docker-activator/-/docker-activator-0.0.2.tgz" | ||
}, | ||
"directories": {}, | ||
"_resolved": "https://registry.npmjs.org/docker-activator/-/docker-activator-0.0.2.tgz", | ||
"readme": "ERROR: No README data found!" | ||
} |
11481
335