support insecure registry (#413)

* support insecure registry
needs PR GoogleContainerTools/kaniko#683  to be merged

Author: yehiyam

core/algorithm-builder/lib/builds/build-algorithm-image-kaniko.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # This script used to create a specific algorithm image
-
+set -e
 source $PWD/lib/builds/build-utils.sh
 
 DOCKER_FILE="__DockerFile__"
@@ -98,4 +98,8 @@ echo
 
 echo
 dockerBuildKaniko ${IMAGE_NAME} ${BUILD_PATH} ${DOCKER_FILE} ${TMP_FOLDER}/workspace ${TMP_FOLDER}/commands
+ret=${exit_code}
+echo build finished with code $ret
 echo
+
+exit $ret

core/algorithm-builder/lib/builds/build-utils.sh

@@ -28,7 +28,7 @@ dockerBuildKaniko() {
   cp -r ${buildPath}/* ${workspace}
   # echo copy docker creds
   # cp ~/.docker/config.json ${commands}/
-  echo "/kaniko/executor --dockerfile ./docker/__DockerFile__ --context dir:///workspace/ --destination $image" > ${commands}/run
+  echo "/kaniko/executor --dockerfile ./docker/__DockerFile__ --insecure --insecure-pull --context dir:///workspace/ --destination $image" > ${commands}/run
   chmod +x ${commands}/run
   cat ${commands}/run
   touch ${commands}/start
@@ -38,6 +38,12 @@ dockerBuildKaniko() {
   done
   echo build done
   cat ${commands}/output
+  # >&2 cat ${commands}/errors
+  if [ -f "${commands}/code_ok" ]; then
+    exit_code=0
+  else
+    exit_code=1
+  fi
 }
 
 dockerBuild() {

core/algorithm-builder/lib/builds/docker-builder.js

@@ -8,6 +8,7 @@ const storageManager = require('@hkube/storage-manager');
 const log = require('@hkube/logger').GetLogFromContainer();
 const States = require('../consts/States');
 const component = require('../consts/components').DOCKER_BUILDER;
+const { KANIKO, DOCKER } = require('../consts/buildModes');
 const stateManger = require('../state/state-manager');
 
 const _ensureDirs = async (dirs) => {
@@ -80,8 +81,11 @@ const _runBash = ({ command, args }) => {
         build.stderr.on('data', (d) => {
             error += d.toString();
         });
-        build.on('close', () => {
-            return resolve({ data, error });
+        build.on('close', (code) => {
+            if (code) {
+                error += `Exit with code ${code}`
+            }
+            return resolve({ data, error, code });
         });
         build.on('error', (err) => {
             return reject(err);
@@ -180,7 +184,7 @@ const _buildDocker = async ({ buildMode, docker, algorithmName, version, buildPa
 
     const baseImage = path.join(pushRegistry, algorithmName);
     const algorithmImage = `${baseImage}:v${version}`;
-    if (buildMode === 'kaniko'){
+    if (buildMode === KANIKO) {
         const dockerCreds = _createDockerCredentials(docker.pull, docker.push);
         await fse.writeJson(path.join(tmpFolder, 'commands', 'config.json'), dockerCreds, { spaces: 2 });
     }
@@ -194,11 +198,15 @@ const _buildDocker = async ({ buildMode, docker, algorithmName, version, buildPa
     _argsHelper(args, "--dplu", docker.pull.user);
     _argsHelper(args, "--dplp", docker.pull.pass);
 
+
     // docker push
     _argsHelper(args, "--dphr", pushRegistry);
     _argsHelper(args, "--dphu", docker.push.user);
     _argsHelper(args, "--dphp", docker.push.pass);
-    _argsHelper(args, "--tmpFolder", tmpFolder);
+
+    if (buildMode === KANIKO) {
+        _argsHelper(args, "--tmpFolder", tmpFolder);
+    }
 
     const output = await _runBash({ command: `${process.cwd()}/lib/builds/build-algorithm-image-${buildMode}.sh`, args });
     return { output, algorithmImage };

core/algorithm-builder/lib/consts/buildModes.js

@@ -0,0 +1,4 @@
+module.exports = {
+    KANIKO: 'kaniko',
+    DOCKER: 'docker'
+};

core/algorithm-builder/lib/utils/formatters.js

@@ -0,0 +1,25 @@
+module.exports = {
+    parseBool(value, defaultValue) {
+        if (typeof value === 'boolean') {
+            return value;
+        }
+        if (typeof value === 'string') {
+            return value.toLowerCase() === 'true';
+        }
+        return defaultValue || false;
+    },
+    parseInt(value, defaultValue) {
+        if (typeof value === 'number') {
+            return value;
+        }
+        if (typeof value === 'string') {
+            try {
+                return parseInt(value, 10);
+            }
+            catch (error) {
+                return defaultValue;
+            }
+        }
+        return defaultValue;
+    }
+};

core/algorithm-builder/tests/formatterTest.js

@@ -0,0 +1,13 @@
+const { expect } = require('chai');
+const { parseBool } = require('../lib/utils/formatters');
+describe('formatter', () => {
+    it('check parse bool', () => {
+        expect(parseBool(undefined)).to.be.false;
+        expect(parseBool(undefined,true)).to.be.true;
+        expect(parseBool('true',true)).to.be.true;
+        expect(parseBool('true',false)).to.be.true;
+        expect(parseBool('false',true)).to.be.false;
+        expect(parseBool('false',false)).to.be.false;
+        expect(parseBool("True")).to.be.true;
+    });
+});