webservices/servicedock
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

little fix: fail outside of socket connection

Browse Source
This commit is contained in:
Marc Wäckerlin
2016-02-19 15:27:00 +00:00
parent ecba312335
commit 702a064814
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
2016-01-31 21:58 marc
* ChangeLog, nodejs/docker/docker.js,
nodejs/public/javascripts/servicedock.js,
nodejs/public/stylesheets/servicedock.css,
nodejs/views/index.ejs: create works
2016-01-29 15:55 marc 2016-01-29 15:55 marc
* nodejs/docker/docker.js, * nodejs/docker/docker.js,

10
nodejs/sockets/index.js
View File

@@ -17,6 +17,10 @@ module.exports = function(io) {
proc.exec(cmd, callback); proc.exec(cmd, callback);
} }
function fail(txt, data) {
console.log("** "+txt, data);
}
var oldcontainer = null; var oldcontainer = null;
function containerinspect(error, stdout, stderr) { function containerinspect(error, stdout, stderr) {
if (error || stderr) if (error || stderr)
@@ -96,7 +100,7 @@ module.exports = function(io) {
function modify(cmd, name) { function modify(cmd, name) {
if (!name.match(/^[a-z0-9][-_:.+a-z0-9]*$/i)) if (!name.match(/^[a-z0-9][-_:.+a-z0-9]*$/i))
return fail("illegal instance name"); return this.fail("illegal instance name");
exec("docker "+cmd+" "+name, updatecontainers); exec("docker "+cmd+" "+name, updatecontainers);
} }
@@ -104,7 +108,7 @@ module.exports = function(io) {
if (cmds.length>0) if (cmds.length>0)
exec(cmds.shift(), function(error, stdout, stderr) { exec(cmds.shift(), function(error, stdout, stderr) {
if (error || stderr) if (error || stderr)
return fail("create container failed", { return this.fail("create container failed", {
error: error, stderr: stderr, stdout: stdout error: error, stderr: stderr, stdout: stdout
}); });
createContainer(cmds); createContainer(cmds);
@@ -175,7 +179,7 @@ module.exports = function(io) {
function new_bash(name) { function new_bash(name) {
if (!name.match(/^[a-z0-9][-_:.+a-z0-9]*$/i)) if (!name.match(/^[a-z0-9][-_:.+a-z0-9]*$/i))
return fail("illegal instance name"); return this.fail("illegal instance name");
if (bash_connections[name]) return; if (bash_connections[name]) return;
bash_connections[name] = bash_connections[name] =
pty.spawn("docker", ["exec", "-it", name, "bash", "-i"]); pty.spawn("docker", ["exec", "-it", name, "bash", "-i"]);