1.0.10

.gitlab-ci.yml

@@ -47,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,12 +0,0 @@
-import "typings-global";
-export declare class dockersock {
-    sockPath: string;
-    constructor(pathArg?: string);
-    listContainers(): any;
-    listContainersDetailed(): any;
-    listContainersRunning(): any;
-    listContainersStopped(): any;
-    listImages(): any;
-    clean(): any;
-    request(methodArg: string, routeArg: string, dataArg?: {}): any;
-}

dist/dockersock.classes.dockersock.d.ts

@@ -0,0 +1,26 @@
+/// <reference types="q" />
+import "typings-global";
+import * as plugins from "./dockersock.plugins";
+import { Observable } from "rxjs";
+export declare class Dockersock {
+    sockPath: string;
+    constructor(pathArg?: string);
+    auth(userArg: string, passArg: string): plugins.q.Promise<{}>;
+    listContainers(): plugins.q.Promise<{}>;
+    listContainersDetailed(): plugins.q.Promise<{}>;
+    listContainersRunning(): plugins.q.Promise<{}>;
+    listContainersStopped(): plugins.q.Promise<{}>;
+    listImages(): plugins.q.Promise<{}>;
+    listImagesDangling(): plugins.q.Promise<{}>;
+    pullImage(imageLabel: string): plugins.q.Promise<{}>;
+    createContainer(optionsArg: any, pullFirstArg?: boolean): plugins.q.Promise<{}>;
+    getContainerId(): void;
+    startContainer(containerNameArg: any): plugins.q.Promise<{}>;
+    stopContainer(containerNameArg: any): plugins.q.Promise<{}>;
+    removeContainer(containerNameArg: any): plugins.q.Promise<{}>;
+    clean(): plugins.q.Promise<{}>;
+    callOnChange(cb: Function): void;
+    getChangeObservable(): Observable<{}>;
+    request(methodArg: string, routeArg: string, queryArg?: string, dataArg?: {}): plugins.q.Promise<{}>;
+    requestStream(methodArg: any, routeArg: any, endArg?: boolean): plugins.q.Promise<{}>;
+}

dist/dockersock.plugins.d.ts

@@ -1,4 +1,5 @@
 import "typings-global";
 export import beautylog = require("beautylog");
-export declare let q: any;
+export import q = require("q");
 export declare let request: any;
+export import rxjs = require("rxjs");

dist/dockersock.plugins.js

@@ -3,5 +3,5 @@ require("typings-global");
 exports.beautylog = require("beautylog");
 exports.q = require("q");
 exports.request = require("request");
-
+exports.rxjs = require("rxjs");
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImRvY2tlcnNvY2sucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBQ1YsaUJBQVMsV0FBVyxXQUFXLENBQUMsQ0FBQztBQUNwQyxTQUFDLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0FBQ2pCLGVBQU8sR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUMiLCJmaWxlIjoiZG9ja2Vyc29jay5wbHVnaW5zLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy1nbG9iYWxcIjtcbmV4cG9ydCBpbXBvcnQgYmVhdXR5bG9nID0gcmVxdWlyZShcImJlYXV0eWxvZ1wiKTtcbmV4cG9ydCBsZXQgcSA9IHJlcXVpcmUoXCJxXCIpO1xuZXhwb3J0IGxldCByZXF1ZXN0ID0gcmVxdWlyZShcInJlcXVlc3RcIik7Il19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG9ja2Vyc29jay5wbHVnaW5zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvZG9ja2Vyc29jay5wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxRQUFPLGdCQUFnQixDQUFDLENBQUE7QUFDVixpQkFBUyxXQUFXLFdBQVcsQ0FBQyxDQUFDO0FBQ2pDLFNBQUMsV0FBVyxHQUFHLENBQUMsQ0FBQztBQUNwQixlQUFPLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0FBQzFCLFlBQUksV0FBVyxNQUFNLENBQUMsQ0FBQyJ9

dist/index.d.ts

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

dist/index.js

@@ -0,0 +1,5 @@
+"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;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBQ3hCLDhDQUF5QixpQ0FBaUMsQ0FBQztBQUFuRCxnRUFBa0QifQ==

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,14 @@
 {
   "name": "dockersock",
-  "version": "1.0.2",
+  "version": "1.0.10",
   "description": "easy communication with docker from node, TypeScript ready",
   "main": "dist/index.js",
+  "typings": "dist/index.d.ts",
   "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",
@@ -25,12 +28,18 @@
   },
   "homepage": "https://gitlab.com/pushrocks/dockersock#README",
   "dependencies": {
-    "beautylog": "^5.0.10",
+    "@types/es6-promise": "0.0.27-alpha",
+    "@types/q": "0.0.26-alpha",
+    "beautylog": "^5.0.12",
+    "es6-promise": "^3.2.1",
     "q": "^1.4.1",
     "request": "^2.72.0",
+    "rxjs": "^5.0.0-beta.10",
     "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,36 @@
+"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();
+            });
+        });
+        it("should pull an image from imagetag", function (done) {
+            this.timeout(60000);
+            testDockersock.pullImage("hosttoday%2Fht-docker-dbase")
+                .then(function (dataArg) {
+                done();
+            }, done);
+        });
+    });
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sY0FBYyxDQUFDLENBQUE7QUFDdEIsUUFBTyxRQUFRLENBQUMsQ0FBQTtBQUVoQixzQkFBeUIsZUFFekIsQ0FBQyxDQUZ1QztBQUV4QyxRQUFRLENBQUMsWUFBWSxFQUFDO0lBQ2xCLFFBQVEsQ0FBQyxlQUFlLEVBQUM7UUFDckIsSUFBSSxjQUF5QixDQUFDO1FBQzlCLEVBQUUsQ0FBQyx5Q0FBeUMsRUFBQztZQUN6QyxjQUFjLEdBQUcsSUFBSSxrQkFBVSxFQUFFLENBQUM7WUFDbEMsY0FBYyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLGtCQUFVLENBQUMsQ0FBQztRQUNwRCxDQUFDLENBQUMsQ0FBQztRQUNILEVBQUUsQ0FBQyx3QkFBd0IsRUFBQyxVQUFTLElBQUk7WUFDckMsY0FBYyxDQUFDLGNBQWMsRUFBRTtpQkFDMUIsSUFBSSxDQUFDLFVBQUMsT0FBTztnQkFDVixPQUFPLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDO2dCQUNyQixJQUFJLEVBQUUsQ0FBQztZQUNYLENBQUMsQ0FBQyxDQUFDO1FBQ1gsQ0FBQyxDQUFDLENBQUM7UUFDSCxFQUFFLENBQUMsaUNBQWlDLEVBQUMsVUFBUyxJQUFJO1lBQzlDLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDbkIsY0FBYyxDQUFDLHNCQUFzQixFQUFFO2lCQUNsQyxJQUFJLENBQUMsVUFBQyxPQUFPO2dCQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUM7Z0JBQ3JCLElBQUksRUFBRSxDQUFDO1lBQ1gsQ0FBQyxDQUFDLENBQUM7UUFDWCxDQUFDLENBQUMsQ0FBQztRQUNILEVBQUUsQ0FBQyxvQ0FBb0MsRUFBQyxVQUFTLElBQUk7WUFDakQsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUNwQixjQUFjLENBQUMsU0FBUyxDQUFDLDZCQUE2QixDQUFDO2lCQUNsRCxJQUFJLENBQUMsVUFBQyxPQUFPO2dCQUNWLElBQUksRUFBRSxDQUFDO1lBQ1gsQ0FBQyxFQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2hCLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQyxDQUFDLENBQUM7QUFDUCxDQUFDLENBQUMsQ0FBQyJ9

test/test.ts

@@ -0,0 +1,36 @@
+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();
+                });
+        });
+        it("should pull an image from imagetag",function(done){
+            this.timeout(60000);
+            testDockersock.pullImage("hosttoday%2Fht-docker-dbase")
+                .then((dataArg)=>{
+                    done();
+                },done);
+        })
+    });
+});

ts/dockersock.class.dockersock.ts

@@ -1,79 +0,0 @@
-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
-    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 = function(){
-                        if(typeof dataArg[recursiveCounter] != "undefined"){
-                            this.request.get("GET","/containers/" + dataArg[recursiveCounter].Id)
-                                .then((data) => {
-                                    recursiveCounter++;
-                                    detailedDataObject.push(data);
-                                    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;
-    }
-    clean() {
-        let done = plugins.q.defer();
-        return done.promise;
-    }
-
-    request(methodArg:string,routeArg:string,dataArg = {}){
-        let done = plugins.q.defer();
-        let jsonArg:string = JSON.stringify(dataArg);
-        let options = {
-            method:methodArg,
-            url:this.sockPath + 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,184 @@
+import "typings-global"
+import * as plugins from "./dockersock.plugins";
+import {Observable} from "rxjs";
+
+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() {
+        return this.request("GET","/images","?all=true");
+    }
+    listImagesDangling(){
+        return this.request("GET","/images","?dangling=true");
+    }
+    pullImage(imageLabel:string){
+        return this.requestStream("POST","/images/create?fromImage=" + imageLabel);
+    };
+    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(){
+
+    };
+    startContainer(containerNameArg){
+        return this.request("POST","/containers/"+ containerNameArg +"/start");
+    };
+    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;
+    };
+    callOnChange(cb:Function){
+        let cbPromise;
+        let changeBuffered:boolean = false; // when cb is running then buffer any consequent change
+        let requestStream = plugins.request.get(this.sockPath + "/events");
+        requestStream.on("response",(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",(data:Buffer) => {
+            let 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(() => {
+                    changeBuffered = false;
+                    cbPromise = cb();
+                });
+            }
+        });
+        requestStream.on("end",()=> {
+            
+        });         
+    };
+    getChangeObservable(){
+        let requestStream = plugins.request.get(this.sockPath + "/events");
+        requestStream.on("response",(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);
+                }
+            });
+        let changeObservable = Observable.fromEvent(requestStream,"data");
+        requestStream.on("end",()=> {
+            
+        });
+        return changeObservable;
+    }
+    request(methodArg:string,routeArg:string,queryArg: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 + queryArg,
+            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;
+    }
+    requestStream(methodArg,routeArg,endArg:boolean = true){
+        let done = plugins.q.defer();
+        if(methodArg == "POST"){
+            let requestStream = plugins.request.post(this.sockPath + routeArg);
+            requestStream.on("response",(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);
+                        done.reject(response);
+                    }
+                });
+            requestStream.on("data",(data:Buffer) => {
+                let status = JSON.parse(data.toString()).status;
+                plugins.beautylog.logReduced(status);
+            });
+            requestStream.on("end",()=> {
+                done.resolve();
+            });         
+        }
+        return done.promise;
+    }
+}

ts/dockersock.plugins.ts

@@ -1,4 +1,5 @@
 import "typings-global";
 export import beautylog = require("beautylog");
-export let q = require("q");
+export import q = require("q");
 export let request = require("request");
+export import rxjs = require("rxjs");

ts/index.ts

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