nscale-util - npm Package Compare versions

Comparing version 0.1.5 to 0.1.6

lib/dockerBuilder.js

@@ -124,8 +124,19 @@ /*
     if (preCheck()) {
-      out.stdout('running build script: sh ./' + containerDef.specific.buildScript);
-      logger.info('running build script: sh ./' + containerDef.specific.buildScript);
-      out.progress('running build script: ' + containerDef.specific.buildScript);
-      executor.exec(mode, 'sh ./' + containerDef.specific.buildScript, path, out, function(err, targetPath) {
+      if (containerDef.specific.buildScript) {
+        out.stdout('running build script: sh ./' + containerDef.specific.buildScript);
+        logger.info('running build script: sh ./' + containerDef.specific.buildScript);
+        out.progress('running build script: ' + containerDef.specific.buildScript);
+        executor.exec(mode, 'sh ./' + containerDef.specific.buildScript, path, out, function(err, targetPath) {
+          out.progress('creating image');
+          createImage(mode, system, containerDef, targetPath, out, function(err, specific) {
+            specific.version = version;
+            containerDef.version = version;
+            cb(err, specific);
+          });
+        });
+      }
+      else {
+        out.progress('no build script present, skipping');
         out.progress('creating image');
-        createImage(mode, system, containerDef, targetPath, out, function(err, specific) {
+        createImage(mode, system, containerDef, '.', out, function(err, specific) {
           specific.version = version;
@@ -135,3 +146,3 @@ containerDef.version = version;
         });
-      });
+      }
     }
@@ -138,0 +149,0 @@ else {

lib/executor.js

@@ -26,3 +26,3 @@ /*
   var proc;
-  var targetPath;
+  var targetPath = '.';
   var errmsg = '';
@@ -40,2 +40,5 @@
       }
+      else {
+        targetPath = '.';
+      }
       out.stdout(data);
@@ -42,0 +45,0 @@ });

package.json

@@ -10,3 +10,3 @@ {
   ],
-  "version": "0.1.5",
+  "version": "0.1.6",
   "license": "Artistic License 2.0",
@@ -13,0 +13,0 @@ "author": "Peter Elger (http://nearform.com/)",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

47334

increased by0.88%

Lines of code

919

increased by1.55%

No dependency changes