From 4da7f5194a6717b8d55704f7787af3388f02aec2 Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Fri, 17 Jun 2016 02:38:00 +0200 Subject: [PATCH] implement .createContainer() --- dist/dockersock.classes.dockersock.d.ts | 4 +- dist/dockersock.classes.dockersock.js | 53 +++++++++++++++++++++---- ts/dockersock.classes.dockersock.ts | 18 +++++++-- 3 files changed, 62 insertions(+), 13 deletions(-) diff --git a/dist/dockersock.classes.dockersock.d.ts b/dist/dockersock.classes.dockersock.d.ts index ff9146b..1ea1246 100644 --- a/dist/dockersock.classes.dockersock.d.ts +++ b/dist/dockersock.classes.dockersock.d.ts @@ -10,13 +10,13 @@ export declare class Dockersock { listImages(): any; listImagesDangling(): any; pullImage(imageLabel: string): any; - createContainer(imageNameArg: any, pullFirst?: boolean): any; + createContainer(optionsArg: any, pullFirstArg?: boolean): any; getContainerId(): void; startContainer(containerNameArg: any): any; stopContainer(containerNameArg: any): any; removeContainer(containerNameArg: any): any; clean(): any; - getChange(): void; + callOnChange(cb: Function): void; request(methodArg: string, routeArg: string, queryArg?: string, dataArg?: {}): any; requestStream(methodArg: any, routeArg: any, endArg?: boolean): any; } diff --git a/dist/dockersock.classes.dockersock.js b/dist/dockersock.classes.dockersock.js index b8999c2..7db6999 100644 --- a/dist/dockersock.classes.dockersock.js +++ b/dist/dockersock.classes.dockersock.js @@ -63,11 +63,23 @@ var Dockersock = (function () { return this.requestStream("POST", "/images/create?fromImage=" + imageLabel); }; ; - Dockersock.prototype.createContainer = function (imageNameArg, pullFirst) { - if (pullFirst === void 0) { pullFirst = true; } - return this.request("POST", "/containers/create", "", { - "image": imageNameArg - }); + Dockersock.prototype.createContainer = function (optionsArg, pullFirstArg) { + var _this = this; + if (pullFirstArg === void 0) { pullFirstArg = true; } + var done = plugins.q.defer(); + var create = function () { + return _this.request("POST", "/containers/create", "", optionsArg); + }; + if (pullFirstArg) { + this.pullImage(optionsArg.Image) + .then(create) + .then(done.resolve); + } + else { + create() + .then(done.resolve); + } + return done.promise; }; ; Dockersock.prototype.getContainerId = function () { @@ -90,7 +102,34 @@ var Dockersock = (function () { return done.promise; }; ; - Dockersock.prototype.getChange = function () { + Dockersock.prototype.callOnChange = function (cb) { + var cbPromise; + var changeBuffered = false; // when cb is running then buffer any consequent change + var requestStream = plugins.request.get(this.sockPath + "/events"); + requestStream.on("response", function (response) { + if (response.statusCode == 200) { + plugins.beautylog.ok("request returned status 200, so we are good!"); + } + else { + plugins.beautylog.error("request returned error: " + response.statusCode); + } + }); + requestStream.on("data", function (data) { + var status = JSON.parse(data.toString()).status; + plugins.beautylog.logReduced(status); + if (typeof cbPromise == "undefined" || cbPromise.state == "pending") { + cbPromise = cb(); + } + else if (changeBuffered) { + changeBuffered = true; + cbPromise.then(function () { + changeBuffered = false; + cbPromise = cb(); + }); + } + }); + requestStream.on("end", function () { + }); }; ; Dockersock.prototype.request = function (methodArg, routeArg, queryArg, dataArg) { @@ -151,4 +190,4 @@ var Dockersock = (function () { }()); exports.Dockersock = Dockersock; -//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["dockersock.classes.dockersock.ts"],"names":[],"mappings":";AAAA,QAAO,gBACP,CAAC,CADsB;AACvB,IAAY,OAAO,WAAM,sBAAsB,CAAC,CAAA;AAEhD;IAEI,oBAAY,OAAoD;QAApD,uBAAoD,GAApD,6CAAoD;QAC5D,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC5B,CAAC;IAED,UAAU;IACV,yBAAI,GAAJ,UAAK,OAAc,EAAC,OAAc;QAC9B,IAAI,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;QAC7B,IAAI,CAAC,OAAO,CAAC,MAAM,EAAC,EAAE,CAAC,CAAC;QACxB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IACD,mCAAc,GAAd;QACI,IAAI,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;QAC7B,IAAI,CAAC,OAAO,CAAC,KAAK,EAAC,aAAa,CAAC;aAC5B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACxB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;;IACD,2CAAsB,GAAtB;QAAA,iBAsBC;QArBG,IAAI,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;QAC7B,IAAI,kBAAkB,GAAG,EAAE,CAAC;QAC5B,IAAI,CAAC,cAAc,EAAE;aAChB,IAAI,CAAC,UAAC,OAAO;YACV,IAAI,gBAAgB,GAAG,CAAC,CAAC;YACzB,IAAI,YAAY,GAAG;gBACf,EAAE,CAAA,CAAC,OAAO,OAAO,CAAC,gBAAgB,CAAC,IAAI,WAAW,CAAC,CAAA,CAAC;oBAChD,KAAI,CAAC,OAAO,CAAC,KAAK,EAAC,cAAc,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC,EAAE,CAAC;yBAC5D,IAAI,CAAC,UAAC,QAAQ;wBACX,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;wBAClC,gBAAgB,EAAE,CAAC;wBACnB,iBAAiB;wBACjB,YAAY,EAAE,CAAC;oBACnB,CAAC,CAAC,CAAC;gBACX,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;gBACrC,CAAC;YACL,CAAC,CAAC;YACF,YAAY,EAAE,CAAC;QACnB,CAAC,CAAC,CAAC;QACP,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;;IACD,0CAAqB,GAArB;QACI,IAAI,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;QAC7B,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IACD,0CAAqB,GAArB;QACI,IAAI,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;QAC7B,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IACD,+BAAU,GAAV;QACI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAC,SAAS,EAAC,WAAW,CAAC,CAAC;IACrD,CAAC;IACD,uCAAkB,GAAlB;QACI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAC,SAAS,EAAC,gBAAgB,CAAC,CAAC;IAC1D,CAAC;IACD,8BAAS,GAAT,UAAU,UAAiB;QACvB,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAC,2BAA2B,GAAG,UAAU,CAAC,CAAC;IAC/E,CAAC;;IACD,oCAAe,GAAf,UAAgB,YAAY,EAAC,SAAwB;QAAxB,yBAAwB,GAAxB,gBAAwB;QACjD,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAC,oBAAoB,EAAC,EAAE,EAAC;YAC/C,OAAO,EAAC,YAAY;SACvB,CAAC,CAAC;IACP,CAAC;;IACD,mCAAc,GAAd;IAEA,CAAC;;IACD,mCAAc,GAAd,UAAe,gBAAgB;QAC3B,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAC,cAAc,GAAE,gBAAgB,GAAE,QAAQ,CAAC,CAAC;IAC3E,CAAC;;IACD,kCAAa,GAAb,UAAc,gBAAgB;QAC1B,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAC,cAAc,GAAE,gBAAgB,GAAE,OAAO,CAAC,CAAC;IAC1E,CAAC;;IACD,oCAAe,GAAf,UAAgB,gBAAgB;QAC5B,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAC,cAAc,GAAG,gBAAgB,GAAG,MAAM,CAAC,CAAC;IAC7E,CAAC;;IACD,0BAAK,GAAL;QACI,IAAI,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;QAC7B,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;;IACD,8BAAS,GAAT;IAEA,CAAC;;IACD,4BAAO,GAAP,UAAQ,SAAgB,EAAC,QAAe,EAAC,QAAoB,EAAE,OAAY;QAAlC,wBAAoB,GAApB,aAAoB;QAAE,uBAAY,GAAZ,YAAY;QACvE,IAAI,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;QAC7B,IAAI,OAAO,GAAU,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAC7C,IAAI,MAAM,GAAU,EAAE,CAAC;QACvB,EAAE,CAAA,CAAC,SAAS,IAAI,KAAK,CAAC;YAAC,MAAM,GAAG,OAAO,CAAC;QACxC,IAAI,OAAO,GAAG;YACV,MAAM,EAAC,SAAS;YAChB,GAAG,EAAC,IAAI,CAAC,QAAQ,GAAG,QAAQ,GAAG,MAAM,GAAG,QAAQ;YAChD,OAAO,EAAC;gBACJ,cAAc,EAAC,kBAAkB;aACpC;YACD,IAAI,EAAC,OAAO;SACf,CAAC;QACF,OAAO,CAAC,OAAO,CAAC,OAAO,EAAC,UAAC,GAAG,EAAE,GAAG,EAAE,IAAI;YACnC,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC,CAAC;gBAChC,IAAI,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACnC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAC9B,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBACjB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBACjB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACrB,CAAC;YAAA,CAAC;QACN,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IACD,kCAAa,GAAb,UAAc,SAAS,EAAC,QAAQ,EAAC,MAAqB;QAArB,sBAAqB,GAArB,aAAqB;QAClD,IAAI,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;QAC7B,EAAE,CAAA,CAAC,SAAS,IAAI,MAAM,CAAC,CAAA,CAAC;YACpB,IAAI,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC,CAAC;YACnE,aAAa,CAAC,EAAE,CAAC,UAAU,EAAC,UAAC,QAAQ;gBAC7B,EAAE,CAAA,CAAC,QAAQ,CAAC,UAAU,IAAI,GAAG,CAAC,CAAA,CAAC;oBAC3B,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,8CAA8C,CAAC,CAAC;gBACzE,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,0BAA0B,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC;oBAC1E,IAAI,CAAC,MAAM,EAAE,CAAC;gBAClB,CAAC;YACL,CAAC,CAAC,CAAC;YACP,aAAa,CAAC,EAAE,CAAC,MAAM,EAAC,UAAC,IAAW;gBAChC,IAAI,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC;gBAChD,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YACzC,CAAC,CAAC,CAAC;YACH,aAAa,CAAC,EAAE,CAAC,KAAK,EAAC;gBACnB,IAAI,CAAC,OAAO,EAAE,CAAC;YACnB,CAAC,CAAC,CAAC;QACP,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IACL,iBAAC;AAAD,CAjIA,AAiIC,IAAA;AAjIY,kBAAU,aAiItB,CAAA","file":"dockersock.classes.dockersock.js","sourcesContent":["import \"typings-global\"\nimport * as plugins from \"./dockersock.plugins\";\n\nexport class Dockersock {\n    sockPath:string;\n    constructor(pathArg:string = \"http://unix:/var/run/docker.sock:\"){\n        this.sockPath = pathArg;\n    }\n\n    // methods\n    auth(userArg:string,passArg:string){\n        let done = plugins.q.defer();\n        this.request(\"POST\",\"\");\n        return done.promise;\n    }\n    listContainers() {\n        let done = plugins.q.defer();\n        this.request(\"GET\",\"/containers\")\n            .then(done.resolve);\n        return done.promise;\n    };\n    listContainersDetailed() {\n        let done = plugins.q.defer();\n        let detailedDataObject = [];\n        this.listContainers()\n            .then((dataArg) => {\n                let recursiveCounter = 0;\n                let makeDetailed = () => {\n                    if(typeof dataArg[recursiveCounter] != \"undefined\"){\n                        this.request(\"GET\",\"/containers/\" + dataArg[recursiveCounter].Id)\n                            .then((dataArg2) => {\n                                detailedDataObject.push(dataArg2);\n                                recursiveCounter++;\n                                // recursive call\n                                makeDetailed();\n                            });\n                    } else {\n                        done.resolve(detailedDataObject);\n                    }\n                };\n                makeDetailed();\n            });\n        return done.promise;\n    };\n    listContainersRunning() {\n        let done = plugins.q.defer();\n        return done.promise;\n    }\n    listContainersStopped() {\n        let done = plugins.q.defer();\n        return done.promise;\n    }\n    listImages() {\n        return this.request(\"GET\",\"/images\",\"?all=true\");\n    }\n    listImagesDangling(){\n        return this.request(\"GET\",\"/images\",\"?dangling=true\");\n    }\n    pullImage(imageLabel:string){\n        return this.requestStream(\"POST\",\"/images/create?fromImage=\" + imageLabel);\n    };\n    createContainer(imageNameArg,pullFirst:boolean = true){\n        return this.request(\"POST\",\"/containers/create\",\"\",{\n            \"image\":imageNameArg\n        });\n    };\n    getContainerId(){\n\n    };\n    startContainer(containerNameArg){\n        return this.request(\"POST\",\"/containers/\"+ containerNameArg +\"/start\");\n    };\n    stopContainer(containerNameArg){\n        return this.request(\"POST\",\"/containers/\"+ containerNameArg +\"/stop\");\n    };\n    removeContainer(containerNameArg){\n        return this.request(\"DELETE\",\"/containers/\" + containerNameArg + \"?v=1\");\n    };\n    clean() {\n        let done = plugins.q.defer();\n        return done.promise;\n    };\n    getChange(){\n\n    };\n    request(methodArg:string,routeArg:string,queryArg:string = \"\", dataArg = {}){\n        let done = plugins.q.defer();\n        let jsonArg:string = JSON.stringify(dataArg);\n        let suffix:string = \"\";\n        if(methodArg == \"GET\") suffix = \"/json\";\n        let options = {\n            method:methodArg,\n            url:this.sockPath + routeArg + suffix + queryArg,\n            headers:{\n                \"Content-Type\":\"application/json\"\n            },\n            body:jsonArg\n        };\n        plugins.request(options,(err, res, body) => {\n            if (!err && res.statusCode == 200) {\n                var responseObj = JSON.parse(body);\n                done.resolve(responseObj);\n            } else {\n                console.log(err);\n                console.log(res);\n                done.reject(err);\n            };\n        });\n        return done.promise;\n    }\n    requestStream(methodArg,routeArg,endArg:boolean = true){\n        let done = plugins.q.defer();\n        if(methodArg == \"POST\"){\n            let requestStream = plugins.request.post(this.sockPath + routeArg);\n            requestStream.on(\"response\",(response) => {\n                    if(response.statusCode == 200){\n                        plugins.beautylog.ok(\"request returned status 200, so we are good!\");\n                    } else {\n                        plugins.beautylog.error(\"request returned error: \" + response.statusCode);\n                        done.reject();\n                    }\n                });\n            requestStream.on(\"data\",(data:Buffer) => {\n                let status = JSON.parse(data.toString()).status;\n                plugins.beautylog.logReduced(status);\n            });\n            requestStream.on(\"end\",()=> {\n                done.resolve();\n            });         \n        }\n        return done.promise;\n    }\n}"]} +//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["dockersock.classes.dockersock.ts"],"names":[],"mappings":"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","file":"dockersock.classes.dockersock.js","sourcesContent":["import \"typings-global\"\nimport * as plugins from \"./dockersock.plugins\";\n\nexport class Dockersock {\n    sockPath:string;\n    constructor(pathArg:string = \"http://unix:/var/run/docker.sock:\"){\n        this.sockPath = pathArg;\n    }\n\n    // methods\n    auth(userArg:string,passArg:string){\n        let done = plugins.q.defer();\n        this.request(\"POST\",\"\");\n        return done.promise;\n    }\n    listContainers() {\n        let done = plugins.q.defer();\n        this.request(\"GET\",\"/containers\")\n            .then(done.resolve);\n        return done.promise;\n    };\n    listContainersDetailed() {\n        let done = plugins.q.defer();\n        let detailedDataObject = [];\n        this.listContainers()\n            .then((dataArg) => {\n                let recursiveCounter = 0;\n                let makeDetailed = () => {\n                    if(typeof dataArg[recursiveCounter] != \"undefined\"){\n                        this.request(\"GET\",\"/containers/\" + dataArg[recursiveCounter].Id)\n                            .then((dataArg2) => {\n                                detailedDataObject.push(dataArg2);\n                                recursiveCounter++;\n                                // recursive call\n                                makeDetailed();\n                            });\n                    } else {\n                        done.resolve(detailedDataObject);\n                    }\n                };\n                makeDetailed();\n            });\n        return done.promise;\n    };\n    listContainersRunning() {\n        let done = plugins.q.defer();\n        return done.promise;\n    }\n    listContainersStopped() {\n        let done = plugins.q.defer();\n        return done.promise;\n    }\n    listImages() {\n        return this.request(\"GET\",\"/images\",\"?all=true\");\n    }\n    listImagesDangling(){\n        return this.request(\"GET\",\"/images\",\"?dangling=true\");\n    }\n    pullImage(imageLabel:string){\n        return this.requestStream(\"POST\",\"/images/create?fromImage=\" + imageLabel);\n    };\n    createContainer(optionsArg,pullFirstArg:boolean = true){\n        let done = plugins.q.defer();\n        let create = () => {\n            return this.request(\"POST\",\"/containers/create\",\"\",optionsArg);\n        }\n        if(pullFirstArg){\n            this.pullImage(optionsArg.Image)\n                .then(create)\n                .then(done.resolve);\n        } else {\n            create()\n                .then(done.resolve)\n        }\n        return done.promise;\n    };\n    getContainerId(){\n\n    };\n    startContainer(containerNameArg){\n        return this.request(\"POST\",\"/containers/\"+ containerNameArg +\"/start\");\n    };\n    stopContainer(containerNameArg){\n        return this.request(\"POST\",\"/containers/\"+ containerNameArg +\"/stop\");\n    };\n    removeContainer(containerNameArg){\n        return this.request(\"DELETE\",\"/containers/\" + containerNameArg + \"?v=1\");\n    };\n    clean() {\n        let done = plugins.q.defer();\n        return done.promise;\n    };\n    callOnChange(cb:Function){\n        let cbPromise;\n        let changeBuffered:boolean = false; // when cb is running then buffer any consequent change\n        let requestStream = plugins.request.get(this.sockPath + \"/events\");\n        requestStream.on(\"response\",(response) => {\n                if(response.statusCode == 200){\n                    plugins.beautylog.ok(\"request returned status 200, so we are good!\");\n                } else {\n                    plugins.beautylog.error(\"request returned error: \" + response.statusCode);\n                }\n            });\n        requestStream.on(\"data\",(data:Buffer) => {\n            let status = JSON.parse(data.toString()).status;\n            plugins.beautylog.logReduced(status);\n            if(typeof cbPromise == \"undefined\" || cbPromise.state == \"pending\"){\n                cbPromise = cb();\n            } else if (changeBuffered) {\n                changeBuffered = true;\n                cbPromise.then(() => {\n                    changeBuffered = false;\n                    cbPromise = cb();\n                });\n            }\n        });\n        requestStream.on(\"end\",()=> {\n            \n        });         \n    };\n    request(methodArg:string,routeArg:string,queryArg:string = \"\", dataArg = {}){\n        let done = plugins.q.defer();\n        let jsonArg:string = JSON.stringify(dataArg);\n        let suffix:string = \"\";\n        if(methodArg == \"GET\") suffix = \"/json\";\n        let options = {\n            method:methodArg,\n            url:this.sockPath + routeArg + suffix + queryArg,\n            headers:{\n                \"Content-Type\":\"application/json\"\n            },\n            body:jsonArg\n        };\n        plugins.request(options,(err, res, body) => {\n            if (!err && res.statusCode == 200) {\n                var responseObj = JSON.parse(body);\n                done.resolve(responseObj);\n            } else {\n                console.log(err);\n                console.log(res);\n                done.reject(err);\n            };\n        });\n        return done.promise;\n    }\n    requestStream(methodArg,routeArg,endArg:boolean = true){\n        let done = plugins.q.defer();\n        if(methodArg == \"POST\"){\n            let requestStream = plugins.request.post(this.sockPath + routeArg);\n            requestStream.on(\"response\",(response) => {\n                    if(response.statusCode == 200){\n                        plugins.beautylog.ok(\"request returned status 200, so we are good!\");\n                    } else {\n                        plugins.beautylog.error(\"request returned error: \" + response.statusCode);\n                        done.reject();\n                    }\n                });\n            requestStream.on(\"data\",(data:Buffer) => {\n                let status = JSON.parse(data.toString()).status;\n                plugins.beautylog.logReduced(status);\n            });\n            requestStream.on(\"end\",()=> {\n                done.resolve();\n            });         \n        }\n        return done.promise;\n    }\n}"]} diff --git a/ts/dockersock.classes.dockersock.ts b/ts/dockersock.classes.dockersock.ts index a1d88f2..c6dd442 100644 --- a/ts/dockersock.classes.dockersock.ts +++ b/ts/dockersock.classes.dockersock.ts @@ -59,10 +59,20 @@ export class Dockersock { pullImage(imageLabel:string){ return this.requestStream("POST","/images/create?fromImage=" + imageLabel); }; - createContainer(imageNameArg,pullFirst:boolean = true){ - return this.request("POST","/containers/create","",{ - "image":imageNameArg - }); + createContainer(optionsArg,pullFirstArg:boolean = true){ + let done = plugins.q.defer(); + let create = () => { + return this.request("POST","/containers/create","",optionsArg); + } + if(pullFirstArg){ + this.pullImage(optionsArg.Image) + .then(create) + .then(done.resolve); + } else { + create() + .then(done.resolve) + } + return done.promise; }; getContainerId(){