1.1.5

.gitlab-ci.yml

@@ -1,31 +1,24 @@
 image: hosttoday/ht-docker-dbase:npmts
+services:
+  - docker:dind
 
 stages:
 - test
 - release
+- trigger
 
-testLEGACY:
+test:
   stage: test
   script:
-    - npmci test legacy
+    - npm install
-  tags:
+    - npm test
-    - docker
-
-testLTS:
-  stage: test
-  script:
-    - npmci test lts
-  tags:
-    - docker
-    
-testSTABLE:
-  stage: test
-  script:
-    - npmci test stable
   tags:
     - docker
+    - lossless
+    - priv
 
 release:
+  image: hosttoday/ht-docker-node:npmts
   stage: release
   environment: npmjs-com_registry
   script:
@@ -34,3 +27,17 @@ release:
     - tags
   tags:
     - docker
+    - lossless
+    - priv
+
+trigger:
+  image: hosttoday/ht-docker-node:npmts
+  stage: trigger
+  script:
+    - npmci trigger
+  only:
+    - tags
+  tags:
+    - docker
+    - lossless
+    - priv

package.json

@@ -1,6 +1,6 @@
 {
   "name": "npmdocker",
-  "version": "1.1.1",
+  "version": "1.1.5",
   "description": "develop npm modules cross platform with docker",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

ts/npmdocker.docker.ts

@@ -85,18 +85,18 @@ let runDockerImage = () => {
     if(config.dockerSock){
         dockerSockString = `-v /var/run/docker.sock:/var/run/docker.sock`
     };
+    plugins.beautylog.log("now running Dockerimage");
     config.exitCode = plugins.shelljs.exec(`docker run ${dockerProjectMountString} ${dockerSockString} --name ${dockerData.containerName} ${dockerData.imageTag}`).code;
     done.resolve();
     return done.promise;
 };
 
-let deleteDockerContainter = () => {
+let deleteDockerContainer = () => {
     let done = plugins.q.defer();
     plugins.shelljs.exec(`docker rm ${dockerData.containerName}`,{
         silent:true
     });
     done.resolve();
-    plugins.beautylog.ok("removed test container!");
     return done.promise
 };
 
@@ -105,17 +105,36 @@ let deleteDockerImage = () => {
     plugins.shelljs.exec(`docker rmi ${dockerData.imageTag}`,{
         silent:true
     });
-    plugins.beautylog.ok("removed test image!");
-    plugins.beautylog.ok("Cleaned up!");
     done.resolve();
     return done.promise
 };
 
 let deleteBuildContext = () => {
     let done = plugins.q.defer();
-    plugins.smartfile.fs.removeSync(paths.buildContextDir);
+    plugins.smartfile.fs.remove(paths.buildContextDir)
-    done.resolve();
+        .then(done.resolve);
     return done.promise;
+};
+
+let preClean = () => {
+    let done = plugins.q.defer();
+    deleteDockerImage()
+        .then(deleteDockerContainer)
+        .then(() => {
+            plugins.beautylog.ok("ensured clean Docker environment!");
+            done.resolve();
+        });
+};
+
+let postClean = () => {
+    let done = plugins.q.defer();
+    deleteDockerContainer()
+        .then(deleteDockerImage)
+        .then(deleteBuildContext)
+        .then(() => {
+            plugins.beautylog.ok("cleaned up!");
+            done.resolve();
+        });
 }
 
 
@@ -124,12 +143,11 @@ export let run = (configArg) => {
     let done = plugins.q.defer();
     config = configArg;
     checkDocker()
+        .then(preClean)
         .then(buildDockerFile)
         .then(buildDockerImage)
         .then(runDockerImage)
-        .then(deleteDockerContainter)
+        .then(postClean)
-        .then(deleteDockerImage)
-        .then(deleteBuildContext)
         .then(() => {
             done.resolve(config);
         })