diff --git a/dist/dockersock.classes.dockersock.d.ts b/dist/dockersock.classes.dockersock.d.ts index e227a4d..75c1418 100644 --- a/dist/dockersock.classes.dockersock.d.ts +++ b/dist/dockersock.classes.dockersock.d.ts @@ -8,10 +8,14 @@ export declare class Dockersock { listContainersRunning(): any; listContainersStopped(): any; listImages(): any; + listImagesDangling(): any; + pullImage(imageLabel: string): void; + createContainer(): any; getContainerId(): void; startContainer(containerNameArg: any): any; - stopContainer(): any; + stopContainer(containerNameArg: any): any; + removeContainer(containerNameArg: any): any; clean(): any; getChange(): void; - request(methodArg: string, routeArg: string, dataArg?: {}): any; + request(methodArg: string, routeArg: string, queryArg?: string, dataArg?: {}): any; } diff --git a/dist/dockersock.classes.dockersock.js b/dist/dockersock.classes.dockersock.js index 2554ac1..cc4c0a2 100644 --- a/dist/dockersock.classes.dockersock.js +++ b/dist/dockersock.classes.dockersock.js @@ -54,18 +54,35 @@ var Dockersock = (function () { return done.promise; }; Dockersock.prototype.listImages = function () { - var done = plugins.q.defer(); - return done.promise; + return this.request("GET", "/images", "?all=true"); }; + Dockersock.prototype.listImagesDangling = function () { + return this.request("GET", "/images", "?dangling=true"); + }; + Dockersock.prototype.pullImage = function (imageLabel) { + }; + ; + Dockersock.prototype.createContainer = function () { + return this.request("POST", "/containers/create", "", { + "image": "" + }); + }; + ; Dockersock.prototype.getContainerId = function () { }; + ; Dockersock.prototype.startContainer = function (containerNameArg) { return this.request("POST", "/containers/" + containerNameArg + "/start"); }; ; - Dockersock.prototype.stopContainer = function () { + Dockersock.prototype.stopContainer = function (containerNameArg) { return this.request("POST", "/containers/" + containerNameArg + "/stop"); }; + ; + Dockersock.prototype.removeContainer = function (containerNameArg) { + return this.request("DELETE", "/containers/" + containerNameArg + "?v=1"); + }; + ; Dockersock.prototype.clean = function () { var done = plugins.q.defer(); return done.promise; @@ -74,7 +91,8 @@ var Dockersock = (function () { Dockersock.prototype.getChange = function () { }; ; - Dockersock.prototype.request = function (methodArg, routeArg, dataArg) { + Dockersock.prototype.request = function (methodArg, routeArg, queryArg, dataArg) { + if (queryArg === void 0) { queryArg = ""; } if (dataArg === void 0) { dataArg = {}; } var done = plugins.q.defer(); var jsonArg = JSON.stringify(dataArg); @@ -83,7 +101,7 @@ var Dockersock = (function () { suffix = "/json"; var options = { method: methodArg, - url: this.sockPath + routeArg + suffix, + url: this.sockPath + routeArg + suffix + queryArg, headers: { "Content-Type": "application/json" }, @@ -107,4 +125,4 @@ var Dockersock = (function () { }()); exports.Dockersock = Dockersock; -//# 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        let done = plugins.q.defer();\n        return done.promise;\n    }\n    getContainerId(){\n\n    }\n    startContainer(containerNameArg){\n        return this.request(\"POST\",\"/containers/\"+ containerNameArg +\"/start\");\n    };\n    stopContainer(){\n        return this.request(\"POST\",\"/containers/\"+ containerNameArg +\"/stop\");\n    }\n    clean() {\n        let done = plugins.q.defer();\n        return done.promise;\n    };\n    getChange(){\n\n    };\n    request(methodArg:string,routeArg: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,\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}"]} +//# 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\n    };\n    createContainer(){\n        return this.request(\"POST\",\"/containers/create\",\"\",{\n            \"image\":\"\"\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}"]} diff --git a/ts/dockersock.classes.dockersock.ts b/ts/dockersock.classes.dockersock.ts index a6dce41..149fe88 100644 --- a/ts/dockersock.classes.dockersock.ts +++ b/ts/dockersock.classes.dockersock.ts @@ -51,18 +51,31 @@ export class Dockersock { return done.promise; } listImages() { - let done = plugins.q.defer(); - return done.promise; + return this.request("GET","/images","?all=true"); } + listImagesDangling(){ + return this.request("GET","/images","?dangling=true"); + } + pullImage(imageLabel:string){ + + }; + createContainer(){ + return this.request("POST","/containers/create","",{ + "image":"" + }); + }; getContainerId(){ - } + }; startContainer(containerNameArg){ return this.request("POST","/containers/"+ containerNameArg +"/start"); }; - stopContainer(){ + stopContainer(containerNameArg){ return this.request("POST","/containers/"+ containerNameArg +"/stop"); - } + }; + removeContainer(containerNameArg){ + return this.request("DELETE","/containers/" + containerNameArg + "?v=1"); + }; clean() { let done = plugins.q.defer(); return done.promise; @@ -70,14 +83,14 @@ export class Dockersock { getChange(){ }; - request(methodArg:string,routeArg:string,dataArg = {}){ + request(methodArg:string,routeArg:string,queryArg:string = "", dataArg = {}){ let done = plugins.q.defer(); let jsonArg:string = JSON.stringify(dataArg); - let suffix:string = "" + let suffix:string = ""; if(methodArg == "GET") suffix = "/json"; let options = { method:methodArg, - url:this.sockPath + routeArg + suffix, + url:this.sockPath + routeArg + suffix + queryArg, headers:{ "Content-Type":"application/json" },