1.0.3

.gitlab-ci.yml

@@ -27,8 +27,6 @@ test:
   stage: test
   script:
     - npmci test docker
-  only:
-    - master
   tags:
     - lossless
     - priv
@@ -49,7 +47,7 @@ trigger:
   script:
     - npmci trigger
   only:
-    - master
+    - tags
   tags:
     - lossless
     - priv

Dockerfile

@@ -1,3 +1,6 @@
-FROM hosttoday/ht-docker-node:lts
+FROM hosttoday/ht-docker-node:npmts
-COPY ./node_modules /app-node/node_modules
+RUN mkdir app-node
-COPY ./dist /app-node/dist 
+COPY ./ /app-node/
+WORKDIR /app-node
+ENV CI true
+CMD ["npmts"]

dist/dockersock.class.dockersock.d.ts

@@ -1,6 +0,0 @@
-import "typings-global";
-export declare class dockersock {
-    sockPath: string;
-    constructor(pathArg: string);
-    request(methodArg: string, routeArg: string, dataArg?: {}): any;
-}

dist/dockersock.class.dockersock.js

@@ -1,38 +0,0 @@
-"use strict";
-require("typings-global");
-var plugins = require("./dockersock.plugins");
-var dockersock = (function () {
-    function dockersock(pathArg) {
-        this.sockPath = pathArg;
-    }
-    dockersock.prototype.request = function (methodArg, routeArg, dataArg) {
-        if (dataArg === void 0) { dataArg = {}; }
-        var done = plugins.q.defer();
-        var jsonArg = JSON.stringify(dataArg);
-        var options = {
-            method: methodArg,
-            url: "http://unix:/var/run/docker.sock:" + routeArg + "/json",
-            headers: {
-                "Content-Type": "application/json"
-            },
-            body: jsonArg
-        };
-        plugins.request(options, function (err, res, body) {
-            if (!err && res.statusCode == 200) {
-                var responseObj = JSON.parse(body);
-                done.resolve(responseObj);
-            }
-            else {
-                console.log(err);
-                console.log(res);
-                done.reject(err);
-            }
-            ;
-        });
-        return done.promise;
-    };
-    return dockersock;
-}());
-exports.dockersock = dockersock;
-
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImRvY2tlcnNvY2suY2xhc3MuZG9ja2Vyc29jay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFDUCxDQUFDLENBRHNCO0FBQ3ZCLElBQVksT0FBTyxXQUFNLHNCQUFzQixDQUFDLENBQUE7QUFFaEQ7SUFFSSxvQkFBWSxPQUFjO1FBQ3RCLElBQUksQ0FBQyxRQUFRLEdBQUcsT0FBTyxDQUFDO0lBQzVCLENBQUM7SUFFRCw0QkFBTyxHQUFQLFVBQVEsU0FBZ0IsRUFBQyxRQUFlLEVBQUMsT0FBWTtRQUFaLHVCQUFZLEdBQVosWUFBWTtRQUNqRCxJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQzdCLElBQUksT0FBTyxHQUFVLElBQUksQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDN0MsSUFBSSxPQUFPLEdBQUc7WUFDVixNQUFNLEVBQUMsU0FBUztZQUNoQixHQUFHLEVBQUMsbUNBQW1DLEdBQUcsUUFBUSxHQUFHLE9BQU87WUFDNUQsT0FBTyxFQUFDO2dCQUNKLGNBQWMsRUFBQyxrQkFBa0I7YUFDcEM7WUFDRCxJQUFJLEVBQUMsT0FBTztTQUNmLENBQUM7UUFDRixPQUFPLENBQUMsT0FBTyxDQUFDLE9BQU8sRUFBQyxVQUFTLEdBQUcsRUFBRSxHQUFHLEVBQUUsSUFBSTtZQUMzQyxFQUFFLENBQUMsQ0FBQyxDQUFDLEdBQUcsSUFBSSxHQUFHLENBQUMsVUFBVSxJQUFJLEdBQUcsQ0FBQyxDQUFDLENBQUM7Z0JBQ2hDLElBQUksV0FBVyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUM7Z0JBQ25DLElBQUksQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLENBQUM7WUFDOUIsQ0FBQztZQUFDLElBQUksQ0FBQyxDQUFDO2dCQUNKLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUM7Z0JBQ2pCLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUM7Z0JBQ2pCLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDckIsQ0FBQztZQUFBLENBQUM7UUFDTixDQUFDLENBQUMsQ0FBQztRQUNILE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO0lBQ3hCLENBQUM7SUFDTCxpQkFBQztBQUFELENBN0JBLEFBNkJDLElBQUE7QUE3Qlksa0JBQVUsYUE2QnRCLENBQUEiLCJmaWxlIjoiZG9ja2Vyc29jay5jbGFzcy5kb2NrZXJzb2NrLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy1nbG9iYWxcIlxuaW1wb3J0ICogYXMgcGx1Z2lucyBmcm9tIFwiLi9kb2NrZXJzb2NrLnBsdWdpbnNcIjtcblxuZXhwb3J0IGNsYXNzIGRvY2tlcnNvY2sge1xuICAgIHNvY2tQYXRoOnN0cmluZztcbiAgICBjb25zdHJ1Y3RvcihwYXRoQXJnOnN0cmluZyl7XG4gICAgICAgIHRoaXMuc29ja1BhdGggPSBwYXRoQXJnO1xuICAgIH1cbiAgICBcbiAgICByZXF1ZXN0KG1ldGhvZEFyZzpzdHJpbmcscm91dGVBcmc6c3RyaW5nLGRhdGFBcmcgPSB7fSl7XG4gICAgICAgIGxldCBkb25lID0gcGx1Z2lucy5xLmRlZmVyKCk7XG4gICAgICAgIGxldCBqc29uQXJnOnN0cmluZyA9IEpTT04uc3RyaW5naWZ5KGRhdGFBcmcpO1xuICAgICAgICBsZXQgb3B0aW9ucyA9IHtcbiAgICAgICAgICAgIG1ldGhvZDptZXRob2RBcmcsXG4gICAgICAgICAgICB1cmw6XCJodHRwOi8vdW5peDovdmFyL3J1bi9kb2NrZXIuc29jazpcIiArIHJvdXRlQXJnICsgXCIvanNvblwiLFxuICAgICAgICAgICAgaGVhZGVyczp7XG4gICAgICAgICAgICAgICAgXCJDb250ZW50LVR5cGVcIjpcImFwcGxpY2F0aW9uL2pzb25cIlxuICAgICAgICAgICAgfSxcbiAgICAgICAgICAgIGJvZHk6anNvbkFyZ1xuICAgICAgICB9O1xuICAgICAgICBwbHVnaW5zLnJlcXVlc3Qob3B0aW9ucyxmdW5jdGlvbihlcnIsIHJlcywgYm9keSl7XG4gICAgICAgICAgICBpZiAoIWVyciAmJiByZXMuc3RhdHVzQ29kZSA9PSAyMDApIHtcbiAgICAgICAgICAgICAgICB2YXIgcmVzcG9uc2VPYmogPSBKU09OLnBhcnNlKGJvZHkpO1xuICAgICAgICAgICAgICAgIGRvbmUucmVzb2x2ZShyZXNwb25zZU9iaik7XG4gICAgICAgICAgICB9IGVsc2Uge1xuICAgICAgICAgICAgICAgIGNvbnNvbGUubG9nKGVycik7XG4gICAgICAgICAgICAgICAgY29uc29sZS5sb2cocmVzKTtcbiAgICAgICAgICAgICAgICBkb25lLnJlamVjdChlcnIpO1xuICAgICAgICAgICAgfTtcbiAgICAgICAgfSk7XG4gICAgICAgIHJldHVybiBkb25lLnByb21pc2U7XG4gICAgfVxufSJdfQ==

dist/dockersock.classes.dockersock.d.ts

@@ -0,0 +1,17 @@
+import "typings-global";
+export declare class Dockersock {
+    sockPath: string;
+    constructor(pathArg?: string);
+    auth(userArg: string, passArg: string): any;
+    listContainers(): any;
+    listContainersDetailed(): any;
+    listContainersRunning(): any;
+    listContainersStopped(): any;
+    listImages(): any;
+    getContainerId(): void;
+    startContainer(containerNameArg: any): any;
+    stopContainer(): any;
+    clean(): any;
+    getChange(): void;
+    request(methodArg: string, routeArg: string, dataArg?: {}): any;
+}

dist/index.d.ts

@@ -0,0 +1,2 @@
+import "typings-global";
+export { Dockersock } from "./dockersock.classes.dockersock";

dist/index.js

@@ -0,0 +1,6 @@
+"use strict";
+require("typings-global");
+var dockersock_classes_dockersock_1 = require("./dockersock.classes.dockersock");
+exports.Dockersock = dockersock_classes_dockersock_1.Dockersock;
+
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxRQUFPLGdCQUFnQixDQUFDLENBQUE7QUFDeEIsOENBQXlCLGlDQUFpQyxDQUFDO0FBQW5ELGdFQUFrRCIsImZpbGUiOiJpbmRleC5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBcInR5cGluZ3MtZ2xvYmFsXCI7XG5leHBvcnQge0RvY2tlcnNvY2t9IGZyb20gXCIuL2RvY2tlcnNvY2suY2xhc3Nlcy5kb2NrZXJzb2NrXCIiXX0=

docker-compose.yml

@@ -0,0 +1,18 @@
+nginx1 :
+  image: "nginx"
+  environment:
+      VIRTUAL_HOST: "test100.labkomp.de"
+  restart: always
+  container_name: nginx1
+nginx2:
+  image: nginx
+  environment:
+    VIRTUAL_HOST: "test101.labkomp.de"
+  restart: always
+  container_name: nginx2
+npmts-test-container:
+  image: "npmts-test-image"
+  volumes:
+    - "/var/run/docker.sock:/var/run/docker.sock"
+  restart: always
+  container_name: npmts-test-container

npmts.json

@@ -1,3 +1,4 @@
 {
-    "mode":"default"
+    "mode":"default",
+    "coverageTreshold":10
 }

package.json

@@ -1,11 +1,13 @@
 {
   "name": "dockersock",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "easy communication with docker from node, TypeScript ready",
   "main": "dist/index.js",
   "scripts": {
-    "test": "npmts",
+    "test": "npmts --notest && npm run build && npm run startdocker && npm run cleanup",
-    "testindocker": "npmts && docker-machine start default; eval \"$(docker-machine env default)\" && docker build -t test-image . && docker run test-image"
+    "build": "docker build -t npmts-test-image .",
+    "startdocker": "docker run -v /var/run/docker.sock:/var/run/docker.sock --name npmts-test-container npmts-test-image",
+    "cleanup": "docker rm npmts-test-container && docker rmi npmts-test-image"
   },
   "repository": {
     "type": "git",
@@ -31,6 +33,8 @@
     "typings-global": "^1.0.3"
   },
   "devDependencies": {
-    "npmts-g": "^5.2.6"
+    "npmts-g": "^5.2.6",
+    "should": "^9.0.2",
+    "typings-test": "^1.0.1"
   }
 }

test/test.d.ts

@@ -0,0 +1,2 @@
+import "typings-test";
+import "should";

test/test.js

@@ -0,0 +1,30 @@
+"use strict";
+require("typings-test");
+require("should");
+var index_1 = require("../dist/index");
+describe("dockersock", function () {
+    describe(".Dockersock()", function () {
+        var testDockersock;
+        it("should create a new Dockersock instance", function () {
+            testDockersock = new index_1.Dockersock();
+            testDockersock.should.be.instanceof(index_1.Dockersock);
+        });
+        it("should list containers", function (done) {
+            testDockersock.listContainers()
+                .then(function (dataArg) {
+                console.log(dataArg);
+                done();
+            });
+        });
+        it("should list detailed containers", function (done) {
+            this.timeout(5000);
+            testDockersock.listContainersDetailed()
+                .then(function (dataArg) {
+                console.log(dataArg);
+                done();
+            });
+        });
+    });
+});
+
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sY0FBYyxDQUFDLENBQUE7QUFDdEIsUUFBTyxRQUVQLENBQUMsQ0FGYztBQUVmLHNCQUF5QixlQUV6QixDQUFDLENBRnVDO0FBRXhDLFFBQVEsQ0FBQyxZQUFZLEVBQUM7SUFDbEIsUUFBUSxDQUFDLGVBQWUsRUFBQztRQUNyQixJQUFJLGNBQXlCLENBQUM7UUFDOUIsRUFBRSxDQUFDLHlDQUF5QyxFQUFDO1lBQ3pDLGNBQWMsR0FBRyxJQUFJLGtCQUFVLEVBQUUsQ0FBQztZQUNsQyxjQUFjLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxVQUFVLENBQUMsa0JBQVUsQ0FBQyxDQUFDO1FBQ3BELENBQUMsQ0FBQyxDQUFDO1FBQ0gsRUFBRSxDQUFDLHdCQUF3QixFQUFDLFVBQVMsSUFBSTtZQUNyQyxjQUFjLENBQUMsY0FBYyxFQUFFO2lCQUMxQixJQUFJLENBQUMsVUFBQyxPQUFPO2dCQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUM7Z0JBQ3JCLElBQUksRUFBRSxDQUFDO1lBQ1gsQ0FBQyxDQUFDLENBQUM7UUFDWCxDQUFDLENBQUMsQ0FBQztRQUNILEVBQUUsQ0FBQyxpQ0FBaUMsRUFBQyxVQUFTLElBQUk7WUFDOUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUNuQixjQUFjLENBQUMsc0JBQXNCLEVBQUU7aUJBQ2xDLElBQUksQ0FBQyxVQUFDLE9BQU87Z0JBQ1YsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztnQkFDckIsSUFBSSxFQUFFLENBQUM7WUFDWCxDQUFDLENBQUMsQ0FBQztRQUNYLENBQUMsQ0FBQyxDQUFDO0lBQ1AsQ0FBQyxDQUFDLENBQUM7QUFDUCxDQUFDLENBQUMsQ0FBQyIsImZpbGUiOiJ0ZXN0LmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy10ZXN0XCI7XG5pbXBvcnQgXCJzaG91bGRcIlxuXG5pbXBvcnQge0RvY2tlcnNvY2t9IGZyb20gXCIuLi9kaXN0L2luZGV4XCJcblxuZGVzY3JpYmUoXCJkb2NrZXJzb2NrXCIsZnVuY3Rpb24oKXtcbiAgICBkZXNjcmliZShcIi5Eb2NrZXJzb2NrKClcIixmdW5jdGlvbigpe1xuICAgICAgICBsZXQgdGVzdERvY2tlcnNvY2s6RG9ja2Vyc29jaztcbiAgICAgICAgaXQoXCJzaG91bGQgY3JlYXRlIGEgbmV3IERvY2tlcnNvY2sgaW5zdGFuY2VcIixmdW5jdGlvbigpe1xuICAgICAgICAgICAgdGVzdERvY2tlcnNvY2sgPSBuZXcgRG9ja2Vyc29jaygpO1xuICAgICAgICAgICAgdGVzdERvY2tlcnNvY2suc2hvdWxkLmJlLmluc3RhbmNlb2YoRG9ja2Vyc29jayk7XG4gICAgICAgIH0pO1xuICAgICAgICBpdChcInNob3VsZCBsaXN0IGNvbnRhaW5lcnNcIixmdW5jdGlvbihkb25lKXtcbiAgICAgICAgICAgIHRlc3REb2NrZXJzb2NrLmxpc3RDb250YWluZXJzKClcbiAgICAgICAgICAgICAgICAudGhlbigoZGF0YUFyZyk9PntcbiAgICAgICAgICAgICAgICAgICAgY29uc29sZS5sb2coZGF0YUFyZyk7XG4gICAgICAgICAgICAgICAgICAgIGRvbmUoKTtcbiAgICAgICAgICAgICAgICB9KTtcbiAgICAgICAgfSk7XG4gICAgICAgIGl0KFwic2hvdWxkIGxpc3QgZGV0YWlsZWQgY29udGFpbmVyc1wiLGZ1bmN0aW9uKGRvbmUpe1xuICAgICAgICAgICAgdGhpcy50aW1lb3V0KDUwMDApO1xuICAgICAgICAgICAgdGVzdERvY2tlcnNvY2subGlzdENvbnRhaW5lcnNEZXRhaWxlZCgpXG4gICAgICAgICAgICAgICAgLnRoZW4oKGRhdGFBcmcpPT57XG4gICAgICAgICAgICAgICAgICAgIGNvbnNvbGUubG9nKGRhdGFBcmcpO1xuICAgICAgICAgICAgICAgICAgICBkb25lKCk7XG4gICAgICAgICAgICAgICAgfSk7XG4gICAgICAgIH0pO1xuICAgIH0pO1xufSk7Il19

test/test.ts

@@ -0,0 +1,29 @@
+import "typings-test";
+import "should"
+
+import {Dockersock} from "../dist/index"
+
+describe("dockersock",function(){
+    describe(".Dockersock()",function(){
+        let testDockersock:Dockersock;
+        it("should create a new Dockersock instance",function(){
+            testDockersock = new Dockersock();
+            testDockersock.should.be.instanceof(Dockersock);
+        });
+        it("should list containers",function(done){
+            testDockersock.listContainers()
+                .then((dataArg)=>{
+                    console.log(dataArg);
+                    done();
+                });
+        });
+        it("should list detailed containers",function(done){
+            this.timeout(5000);
+            testDockersock.listContainersDetailed()
+                .then((dataArg)=>{
+                    console.log(dataArg);
+                    done();
+                });
+        });
+    });
+});

test/testEnv.sh

@@ -0,0 +1,2 @@
+docker build -t dockersock-image .
+docker-compose up

ts/dockersock.class.dockersock.ts

@@ -1,33 +0,0 @@
-import "typings-global"
-import * as plugins from "./dockersock.plugins";
-
-export class dockersock {
-    sockPath:string;
-    constructor(pathArg:string){
-        this.sockPath = pathArg;
-    }
-    
-    request(methodArg:string,routeArg:string,dataArg = {}){
-        let done = plugins.q.defer();
-        let jsonArg:string = JSON.stringify(dataArg);
-        let options = {
-            method:methodArg,
-            url:"http://unix:/var/run/docker.sock:" + routeArg + "/json",
-            headers:{
-                "Content-Type":"application/json"
-            },
-            body:jsonArg
-        };
-        plugins.request(options,function(err, res, body){
-            if (!err && res.statusCode == 200) {
-                var responseObj = JSON.parse(body);
-                done.resolve(responseObj);
-            } else {
-                console.log(err);
-                console.log(res);
-                done.reject(err);
-            };
-        });
-        return done.promise;
-    }
-}

ts/dockersock.classes.dockersock.ts

@@ -0,0 +1,98 @@
+import "typings-global"
+import * as plugins from "./dockersock.plugins";
+
+export class Dockersock {
+    sockPath:string;
+    constructor(pathArg:string = "http://unix:/var/run/docker.sock:"){
+        this.sockPath = pathArg;
+    }
+
+    // methods
+    auth(userArg:string,passArg:string){
+        let done = plugins.q.defer();
+        this.request("POST","");
+        return done.promise;
+    }
+    listContainers() {
+        let done = plugins.q.defer();
+        this.request("GET","/containers")
+            .then(done.resolve);
+        return done.promise;
+    };
+    listContainersDetailed() {
+        let done = plugins.q.defer();
+        let detailedDataObject = [];
+        this.listContainers()
+            .then((dataArg) => {
+                let recursiveCounter = 0;
+                let makeDetailed = () => {
+                    if(typeof dataArg[recursiveCounter] != "undefined"){
+                        this.request("GET","/containers/" + dataArg[recursiveCounter].Id)
+                            .then((dataArg2) => {
+                                detailedDataObject.push(dataArg2);
+                                recursiveCounter++;
+                                // recursive call
+                                makeDetailed();
+                            });
+                    } else {
+                        done.resolve(detailedDataObject);
+                    }
+                };
+                makeDetailed();
+            });
+        return done.promise;
+    };
+    listContainersRunning() {
+        let done = plugins.q.defer();
+        return done.promise;
+    }
+    listContainersStopped() {
+        let done = plugins.q.defer();
+        return done.promise;
+    }
+    listImages() {
+        let done = plugins.q.defer();
+        return done.promise;
+    }
+    getContainerId(){
+
+    }
+    startContainer(containerNameArg){
+        return this.request("POST","/containers/"+ containerNameArg +"/start");
+    };
+    stopContainer(){
+        return this.request("POST","/containers/"+ containerNameArg +"/stop");
+    }
+    clean() {
+        let done = plugins.q.defer();
+        return done.promise;
+    };
+    getChange(){
+
+    };
+    request(methodArg:string,routeArg:string,dataArg = {}){
+        let done = plugins.q.defer();
+        let jsonArg:string = JSON.stringify(dataArg);
+        let suffix:string = ""
+        if(methodArg == "GET") suffix = "/json";
+        let options = {
+            method:methodArg,
+            url:this.sockPath + routeArg + suffix,
+            headers:{
+                "Content-Type":"application/json"
+            },
+            body:jsonArg
+        };
+        plugins.request(options,(err, res, body) => {
+            if (!err && res.statusCode == 200) {
+                var responseObj = JSON.parse(body);
+                done.resolve(responseObj);
+            } else {
+                console.log(err);
+                console.log(res);
+                done.reject(err);
+            };
+        });
+        return done.promise;
+    }
+}

ts/index.ts

@@ -0,0 +1,2 @@
+import "typings-global";
+export {Dockersock} from "./dockersock.classes.dockersock"