1.0.16

.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: hosttoday/ht-docker-dbase
+image: hosttoday/ht-docker-dbase:npmts
 services:
   - docker:dind
 

Dockerfile

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

README.md

@@ -1,5 +1,5 @@
 # dockersock
-easy communication with docker from node, TypeScript ready
+easy communication with docker remote api from node, TypeScript ready
 
 ## Status
 [![build status](https://gitlab.com/pushrocks/dockersock/badges/master/build.svg)](https://gitlab.com/pushrocks/dockersock/commits/master)

dist/dockersock.classes.dockersock.d.ts

@@ -12,7 +12,7 @@ export declare class Dockersock {
     listContainersStopped(): plugins.q.Promise<{}>;
     listImages(): plugins.q.Promise<{}>;
     listImagesDangling(): plugins.q.Promise<{}>;
-    pullImage(imageLabel: string): plugins.q.Promise<{}>;
+    pullImage(imageLabelArg: string): plugins.q.Promise<{}>;
     createContainer(optionsArg: any, pullFirstArg?: boolean): plugins.q.Promise<{}>;
     getContainerId(): void;
     startContainer(containerNameArg: any): plugins.q.Promise<{}>;
@@ -22,5 +22,5 @@ export declare class Dockersock {
     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<{}>;
+    requestStream(methodArg: string, routeArg: string, queryArg?: string, dataArg?: {}): plugins.q.Promise<{}>;
 }

dist/dockersock.plugins.d.ts

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

dist/dockersock.plugins.js

@@ -4,4 +4,4 @@ exports.beautylog = require("beautylog");
 exports.q = require("q");
 exports.request = require("request");
 exports.rxjs = require("rxjs");
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG9ja2Vyc29jay5wbHVnaW5zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvZG9ja2Vyc29jay5wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxRQUFPLGdCQUFnQixDQUFDLENBQUE7QUFDVixpQkFBUyxXQUFXLFdBQVcsQ0FBQyxDQUFDO0FBQ2pDLFNBQUMsV0FBVyxHQUFHLENBQUMsQ0FBQztBQUNwQixlQUFPLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0FBQzFCLFlBQUksV0FBVyxNQUFNLENBQUMsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG9ja2Vyc29jay5wbHVnaW5zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvZG9ja2Vyc29jay5wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxRQUFPLGdCQUFnQixDQUFDLENBQUE7QUFDVixpQkFBUyxXQUFXLFdBQVcsQ0FBQyxDQUFDO0FBQ2pDLFNBQUMsV0FBVyxHQUFHLENBQUMsQ0FBQztBQUNqQixlQUFPLFdBQVcsU0FBUyxDQUFDLENBQUM7QUFDN0IsWUFBSSxXQUFXLE1BQU0sQ0FBQyxDQUFDIn0=

dist/index.js

@@ -2,4 +2,4 @@
 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==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBQ3hCLDhDQUF5QixpQ0FBaUMsQ0FBQztBQUFuRCxnRUFBbUQifQ==

npmextra.json

@@ -0,0 +1,11 @@
+{
+    "npmts":{
+        "mode":"default",
+        "coverageTreshold":10
+    },
+    "npmdocker":{
+        "baseImage":"hosttoday/ht-docker-node:npmts",
+        "command":"npmts",
+        "dockerSock":"true"
+    }
+}

npmts.json

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

package.json

@@ -1,14 +1,11 @@
 {
   "name": "dockersock",
-  "version": "1.0.10",
-  "description": "easy communication with docker from node, TypeScript ready",
+  "version": "1.0.16",
+  "description": "easy communication with docker remote api from node, TypeScript ready",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
-    "test": "npmts --notest && npm run build && npm run startdocker && npm run cleanup",
-    "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"
+    "test": "npmdocker"
   },
   "repository": {
     "type": "git",
@@ -28,14 +25,13 @@
   },
   "homepage": "https://gitlab.com/pushrocks/dockersock#README",
   "dependencies": {
-    "@types/es6-promise": "0.0.27-alpha",
-    "@types/q": "0.0.26-alpha",
-    "beautylog": "^5.0.12",
-    "es6-promise": "^3.2.1",
+    "@types/q": "^0.0.27",
+    "@types/request": "^0.0.27",
+    "beautylog": "^5.0.14",
     "q": "^1.4.1",
-    "request": "^2.72.0",
+    "request": "^2.73.0",
     "rxjs": "^5.0.0-beta.10",
-    "typings-global": "^1.0.3"
+    "typings-global": "^1.0.6"
   },
   "devDependencies": {
     "npmts-g": "^5.2.6",

test/test.js

@@ -1,17 +1,17 @@
 "use strict";
 require("typings-test");
 require("should");
-var index_1 = require("../dist/index");
+const index_1 = require("../dist/index");
 describe("dockersock", function () {
     describe(".Dockersock()", function () {
-        var testDockersock;
+        let 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) {
+                .then((dataArg) => {
                 console.log(dataArg);
                 done();
             });
@@ -19,18 +19,18 @@ describe("dockersock", function () {
         it("should list detailed containers", function (done) {
             this.timeout(5000);
             testDockersock.listContainersDetailed()
-                .then(function (dataArg) {
+                .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(function (dataArg) {
+            testDockersock.pullImage("hosttoday/ht-docker-dbase")
+                .then((dataArg) => {
                 done();
             }, done);
         });
     });
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sY0FBYyxDQUFDLENBQUE7QUFDdEIsUUFBTyxRQUFRLENBQUMsQ0FBQTtBQUVoQixzQkFBeUIsZUFFekIsQ0FBQyxDQUZ1QztBQUV4QyxRQUFRLENBQUMsWUFBWSxFQUFDO0lBQ2xCLFFBQVEsQ0FBQyxlQUFlLEVBQUM7UUFDckIsSUFBSSxjQUF5QixDQUFDO1FBQzlCLEVBQUUsQ0FBQyx5Q0FBeUMsRUFBQztZQUN6QyxjQUFjLEdBQUcsSUFBSSxrQkFBVSxFQUFFLENBQUM7WUFDbEMsY0FBYyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLGtCQUFVLENBQUMsQ0FBQztRQUNwRCxDQUFDLENBQUMsQ0FBQztRQUNILEVBQUUsQ0FBQyx3QkFBd0IsRUFBQyxVQUFTLElBQUk7WUFDckMsY0FBYyxDQUFDLGNBQWMsRUFBRTtpQkFDMUIsSUFBSSxDQUFDLFVBQUMsT0FBTztnQkFDVixPQUFPLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDO2dCQUNyQixJQUFJLEVBQUUsQ0FBQztZQUNYLENBQUMsQ0FBQyxDQUFDO1FBQ1gsQ0FBQyxDQUFDLENBQUM7UUFDSCxFQUFFLENBQUMsaUNBQWlDLEVBQUMsVUFBUyxJQUFJO1lBQzlDLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDbkIsY0FBYyxDQUFDLHNCQUFzQixFQUFFO2lCQUNsQyxJQUFJLENBQUMsVUFBQyxPQUFPO2dCQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUM7Z0JBQ3JCLElBQUksRUFBRSxDQUFDO1lBQ1gsQ0FBQyxDQUFDLENBQUM7UUFDWCxDQUFDLENBQUMsQ0FBQztRQUNILEVBQUUsQ0FBQyxvQ0FBb0MsRUFBQyxVQUFTLElBQUk7WUFDakQsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUNwQixjQUFjLENBQUMsU0FBUyxDQUFDLDZCQUE2QixDQUFDO2lCQUNsRCxJQUFJLENBQUMsVUFBQyxPQUFPO2dCQUNWLElBQUksRUFBRSxDQUFDO1lBQ1gsQ0FBQyxFQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2hCLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQyxDQUFDLENBQUM7QUFDUCxDQUFDLENBQUMsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sY0FBYyxDQUFDLENBQUE7QUFDdEIsUUFBTyxRQUFRLENBQUMsQ0FBQTtBQUVoQix3QkFBeUIsZUFFekIsQ0FBQyxDQUZ1QztBQUV4QyxRQUFRLENBQUMsWUFBWSxFQUFDO0lBQ2xCLFFBQVEsQ0FBQyxlQUFlLEVBQUM7UUFDckIsSUFBSSxjQUF5QixDQUFDO1FBQzlCLEVBQUUsQ0FBQyx5Q0FBeUMsRUFBQztZQUN6QyxjQUFjLEdBQUcsSUFBSSxrQkFBVSxFQUFFLENBQUM7WUFDbEMsY0FBYyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLGtCQUFVLENBQUMsQ0FBQztRQUNwRCxDQUFDLENBQUMsQ0FBQztRQUNILEVBQUUsQ0FBQyx3QkFBd0IsRUFBQyxVQUFTLElBQUk7WUFDckMsY0FBYyxDQUFDLGNBQWMsRUFBRTtpQkFDMUIsSUFBSSxDQUFDLENBQUMsT0FBTztnQkFDVixPQUFPLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDO2dCQUNyQixJQUFJLEVBQUUsQ0FBQztZQUNYLENBQUMsQ0FBQyxDQUFDO1FBQ1gsQ0FBQyxDQUFDLENBQUM7UUFDSCxFQUFFLENBQUMsaUNBQWlDLEVBQUMsVUFBUyxJQUFJO1lBQzlDLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDbkIsY0FBYyxDQUFDLHNCQUFzQixFQUFFO2lCQUNsQyxJQUFJLENBQUMsQ0FBQyxPQUFPO2dCQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUM7Z0JBQ3JCLElBQUksRUFBRSxDQUFDO1lBQ1gsQ0FBQyxDQUFDLENBQUM7UUFDWCxDQUFDLENBQUMsQ0FBQztRQUNILEVBQUUsQ0FBQyxvQ0FBb0MsRUFBQyxVQUFTLElBQUk7WUFDakQsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUNwQixjQUFjLENBQUMsU0FBUyxDQUFDLDJCQUEyQixDQUFDO2lCQUNoRCxJQUFJLENBQUMsQ0FBQyxPQUFPO2dCQUNWLElBQUksRUFBRSxDQUFDO1lBQ1gsQ0FBQyxFQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2hCLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQyxDQUFDLENBQUM7QUFDUCxDQUFDLENBQUMsQ0FBQyJ9

test/test.ts

@@ -27,7 +27,7 @@ describe("dockersock",function(){
         });
         it("should pull an image from imagetag",function(done){
             this.timeout(60000);
-            testDockersock.pullImage("hosttoday%2Fht-docker-dbase")
+            testDockersock.pullImage("hosttoday/ht-docker-dbase")
                 .then((dataArg)=>{
                     done();
                 },done);

ts/dockersock.classes.dockersock.ts

@@ -57,7 +57,8 @@ export class Dockersock {
     listImagesDangling(){
         return this.request("GET","/images","?dangling=true");
     }
-    pullImage(imageLabel:string){
+    pullImage(imageLabelArg:string){
+        let imageLabel = encodeURI(imageLabelArg);
         return this.requestStream("POST","/images/create?fromImage=" + imageLabel);
     };
     createContainer(optionsArg,pullFirstArg:boolean = true){
@@ -120,7 +121,21 @@ export class Dockersock {
         });         
     };
     getChangeObservable(){
-        let requestStream = plugins.request.get(this.sockPath + "/events");
+        let options = {
+            method:"GET",
+            url:this.sockPath + "/events",
+            headers:{
+                "Content-Type":"application/json",
+                "Host":"docker.sock"
+            }
+        };
+        let requestStream = plugins.request(options,(err, res, body) => {
+            if (!err && res.statusCode == 200) {
+            } else {
+                console.log(err);
+                console.log(res);
+            };
+        });
         requestStream.on("response",(response) => {
                 if(response.statusCode == 200){
                     plugins.beautylog.ok("request returned status 200, so we are good!");
@@ -130,7 +145,6 @@ export class Dockersock {
             });
         let changeObservable = Observable.fromEvent(requestStream,"data");
         requestStream.on("end",()=> {          
-            
         });
         return changeObservable;
     }
@@ -143,10 +157,12 @@ export class Dockersock {
             method:methodArg,
             url:this.sockPath + routeArg + suffix + queryArg,
             headers:{
-                "Content-Type":"application/json"
+                "Content-Type":"application/json",
+                "Host":"docker.sock"
             },
             body:jsonArg
         };
+        //console.log(options);
         plugins.request(options,(err, res, body) => {
             if (!err && res.statusCode == 200) {
                 var responseObj = JSON.parse(body);
@@ -159,10 +175,28 @@ export class Dockersock {
         });
         return done.promise;
     }
-    requestStream(methodArg,routeArg,endArg:boolean = true){
+    requestStream(methodArg:string,routeArg:string,queryArg:string = "", dataArg = {}){
         let done = plugins.q.defer();
-        if(methodArg == "POST"){
-            let requestStream = plugins.request.post(this.sockPath + routeArg);
+        let jsonArg:string = JSON.stringify(dataArg);
+        let suffix:string = "";
+        let options = {
+            method:methodArg,
+            url:this.sockPath + routeArg + suffix + queryArg,
+            headers:{
+                "Content-Type":"application/json",
+                "Host":"docker.sock"
+            },
+            body:jsonArg
+        };
+        let requestStream = plugins.request(options,(err, res, body) => {
+            if (!err && res.statusCode == 200) {
+                done.resolve();
+            } else {
+                console.log(err);
+                console.log(res);
+                done.reject(err);
+            };
+        });
         requestStream.on("response",(response) => {
                 if(response.statusCode == 200){
                     plugins.beautylog.ok("request returned status 200, so we are good!");
@@ -172,13 +206,10 @@ export class Dockersock {
                 }
             });
         requestStream.on("data",(data:Buffer) => {
-                let status = JSON.parse(data.toString()).status;
+            let status;
+            status = JSON.parse(data.toString()).status;
             plugins.beautylog.logReduced(status);
         });
-            requestStream.on("end",()=> {
-                done.resolve();
-            });         
-        }
         return done.promise;
     }
 }

ts/dockersock.plugins.ts

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

ts/index.ts

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