2.1.20

.gitlab-ci.yml

@@ -1,9 +1,10 @@
 image: hosttoday/ht-docker-node:lts
 
 stages:
-- test
 - release
 - trigger
+- test
+
 
 before_script:
   - npm install -g npmci

package.json

@@ -1,6 +1,6 @@
 {
   "name": "npmci",
-  "version": "2.1.15",
+  "version": "2.1.20",
   "description": "",
   "main": "dist/index.js",
   "bin": {

ts/npmci.build.docker.ts

@@ -15,7 +15,7 @@ export let build = function(){
 }
 
 let readDockerfiles = function(){
-    return plugins.through2(function(file,enc,cb){
+    return plugins.through2.obj(function(file,enc,cb){
         let myDockerfile = new Dockerfile({
             filePath:file.path,
             read:true
@@ -30,6 +30,7 @@ let readDockerfiles = function(){
 let sortDockerfiles = function(){
     let done = plugins.q.defer();
     let redoSort:boolean;
+    let sortCounter:number = 0;
     let sortFunction = function(){
         redoSort = false;
         let notYetBuiltImages:string[] = [];
@@ -37,9 +38,12 @@ let sortDockerfiles = function(){
             notYetBuiltImages.push(dockerFileArg.cleanTag);
         });
         NpmciEnv.dockerFiles.sort(function(a,b){
-            plugins.beautylog.log("sort build order for Dockerimages");
+            console.log("iteration: " + sortCounter.toString());
+            console.log(notYetBuiltImages)
+            console.log(a.cleanTag);
             let aIndex = notYetBuiltImages.indexOf(a.cleanTag);
             if(aIndex != -1){notYetBuiltImages.splice(aIndex,1)}
+            console.log(notYetBuiltImages);
             if(notYetBuiltImages.indexOf(b.cleanTag) != -1){
                 redoSort = true;
                 return -1;
@@ -47,7 +51,8 @@ let sortDockerfiles = function(){
                 return 0
             }
         });
-        if(redoSort){
+        if(redoSort && sortCounter <= 50){
+            sortCounter++;
             sortFunction();
         } else {
             done.resolve();
@@ -108,7 +113,7 @@ let dockerFileVersion = function(dockerfileNameArg:string):string{
     let versionString:string;
     let versionRegex = /Dockerfile_([a-zA-Z0-9\.]*)$/;
     let regexResultArray = versionRegex.exec(dockerfileNameArg);
-    if(regexResultArray.length = 2){
+    if(regexResultArray && regexResultArray.length == 2){
         versionString = regexResultArray[1];        
     } else {
         versionString = "latest";