@catladder/cli 0.0.0-main-52fe0074 → 0.0.0-main-d4f1e432

package/dist/bundles/catenv/index.js

@@ -39053,18 +39053,22 @@ var requiresDockerBuild = function (context) {
   return false;
 };
 exports.requiresDockerBuild = requiresDockerBuild;
+var getDockerBaseVariables = function () {
+  return {
+    DOCKER_HOST: "tcp://0.0.0.0:2375",
+    DOCKER_TLS_CERTDIR: "",
+    DOCKER_DRIVER: "overlay2",
+    DOCKER_BUILDKIT: "1"
+  };
+};
 var getDockerBuildVariables = function (context) {
   var _a, _b, _c, _d;
-  return __assign(__assign(__assign({}, DOCKER_RUNNER_BUILD_VARIABLES), {
-    DOCKER_BUILDKIT: "1",
+  return __assign(__assign(__assign(__assign({}, DOCKER_RUNNER_BUILD_VARIABLES), {
     DOCKERFILE_ADDITIONS: (_b = (_a = context.componentConfig.build.docker) === null || _a === void 0 ? void 0 : _a.additionsBegin) === null || _b === void 0 ? void 0 : _b.join("\n"),
     DOCKERFILE_ADDITIONS_END: (_d = (_c = context.componentConfig.build.docker) === null || _c === void 0 ? void 0 : _c.additionsEnd) === null || _d === void 0 ? void 0 : _d.join("\n"),
     APP_DIR: context.componentConfig.dir,
-    DOCKER_HOST: "tcp://0.0.0.0:2375",
-    DOCKER_TLS_CERTDIR: "",
-    DOCKER_DIR: ".",
-    DOCKER_DRIVER: "overlay2"
-  }), (0, exports.getDockerImageVariables)(context));
+    DOCKER_DIR: "."
+  }), getDockerBaseVariables()), (0, exports.getDockerImageVariables)(context));
 };
 exports.getDockerBuildVariables = getDockerBuildVariables;
 exports.DOCKER_BUILD_JOB_NAME = "🔨 docker";
@@ -39075,7 +39079,7 @@ var getDockerJobBaseProps = function (context) {
       name: "docker:20-dind",
       command: ["--tls=false"]
     }],
-    variables: (0, exports.getDockerBuildVariables)(context)
+    variables: getDockerBaseVariables()
   };
 };
 exports.getDockerJobBaseProps = getDockerJobBaseProps;
@@ -39088,7 +39092,9 @@ var createDockerBuildJobBase = function (context, _a) {
     stage: "build"
   }, (0, exports.getDockerJobBaseProps)(context)), {
     script: script || []
-  }), def);
+  }), {
+    variables: (0, exports.getDockerBuildVariables)(context)
+  }, def);
 };
 exports.createDockerBuildJobBase = createDockerBuildJobBase;
 exports.gitlabDockerLogin = "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY";
@@ -40106,7 +40112,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-52fe0074" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-d4f1e432" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),

package/dist/bundles/cli/index.js

@@ -350385,18 +350385,22 @@ var requiresDockerBuild = function (context) {
   return false;
 };
 exports.requiresDockerBuild = requiresDockerBuild;
+var getDockerBaseVariables = function () {
+  return {
+    DOCKER_HOST: "tcp://0.0.0.0:2375",
+    DOCKER_TLS_CERTDIR: "",
+    DOCKER_DRIVER: "overlay2",
+    DOCKER_BUILDKIT: "1"
+  };
+};
 var getDockerBuildVariables = function (context) {
   var _a, _b, _c, _d;
-  return __assign(__assign(__assign({}, DOCKER_RUNNER_BUILD_VARIABLES), {
-    DOCKER_BUILDKIT: "1",
+  return __assign(__assign(__assign(__assign({}, DOCKER_RUNNER_BUILD_VARIABLES), {
     DOCKERFILE_ADDITIONS: (_b = (_a = context.componentConfig.build.docker) === null || _a === void 0 ? void 0 : _a.additionsBegin) === null || _b === void 0 ? void 0 : _b.join("\n"),
     DOCKERFILE_ADDITIONS_END: (_d = (_c = context.componentConfig.build.docker) === null || _c === void 0 ? void 0 : _c.additionsEnd) === null || _d === void 0 ? void 0 : _d.join("\n"),
     APP_DIR: context.componentConfig.dir,
-    DOCKER_HOST: "tcp://0.0.0.0:2375",
-    DOCKER_TLS_CERTDIR: "",
-    DOCKER_DIR: ".",
-    DOCKER_DRIVER: "overlay2"
-  }), (0, exports.getDockerImageVariables)(context));
+    DOCKER_DIR: "."
+  }), getDockerBaseVariables()), (0, exports.getDockerImageVariables)(context));
 };
 exports.getDockerBuildVariables = getDockerBuildVariables;
 exports.DOCKER_BUILD_JOB_NAME = "🔨 docker";
@@ -350407,7 +350411,7 @@ var getDockerJobBaseProps = function (context) {
       name: "docker:20-dind",
       command: ["--tls=false"]
     }],
-    variables: (0, exports.getDockerBuildVariables)(context)
+    variables: getDockerBaseVariables()
   };
 };
 exports.getDockerJobBaseProps = getDockerJobBaseProps;
@@ -350420,7 +350424,9 @@ var createDockerBuildJobBase = function (context, _a) {
     stage: "build"
   }, (0, exports.getDockerJobBaseProps)(context)), {
     script: script || []
-  }), def);
+  }), {
+    variables: (0, exports.getDockerBuildVariables)(context)
+  }, def);
 };
 exports.createDockerBuildJobBase = createDockerBuildJobBase;
 exports.gitlabDockerLogin = "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY";
@@ -351438,7 +351444,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-52fe0074" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-d4f1e432" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),

package/package.json

@@ -24,7 +24,7 @@
     "node": ">=12.0.0"
   },
   "devDependencies": {
-    "@catladder/pipeline": "0.0.0-main-52fe0074",
+    "@catladder/pipeline": "0.0.0-main-d4f1e432",
     "@kubernetes/client-node": "^0.16.2",
     "@tsconfig/node14": "^1.0.1",
     "@types/common-tags": "^1.8.0",
@@ -57,6 +57,6 @@
     "typescript": "^4.5.4",
     "vorpal": "^1.12.0"
   },
-  "version": "0.0.0-main-52fe0074",
+  "version": "0.0.0-main-d4f1e432",
   "stableVersion": "0.0.0"
 }