@catladder/cli 0.0.0-main-d184a023 → 0.0.0-main-a38769c0

package/dist/bundles/catenv/index.js

@@ -39743,29 +39743,25 @@ exports.createRailsBuildJobs = void 0;
 var types_1 = __nccwpck_require__(1197);
 var docker_1 = __nccwpck_require__(3219);
 var createRailsBuildJobs = function (context) {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c;
   var buildConfig = context.componentConfig.build;
   if (!(0, types_1.isOfBuildType)(buildConfig, "rails")) {
     // should not happen
     throw new Error("build type is not rails");
   }
   var cnbConf = buildConfig.cnbBuilder;
-  // backwards compatabilty with CNB_ENV_VARS
-  // TODO: remove when all projects are migrated
-  var packEnvArgs = (_c = (_b = (_a = buildConfig.extraVars) === null || _a === void 0 ? void 0 : _a.CNB_ENV_VARS) === null || _b === void 0 ? void 0 : _b.split(" ").map(function (v) {
-    return "--env '".concat(v, "'");
-  })) !== null && _c !== void 0 ? _c : Object.entries((_d = cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.buildVars) !== null && _d !== void 0 ? _d : {}).map(function (_a) {
+  var packEnvArgs = Object.entries((_a = cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.buildVars) !== null && _a !== void 0 ? _a : {}).map(function (_a) {
     var _b = __read(_a, 2),
       k = _b[0],
       v = _b[1];
     return "--env '".concat(k).concat(v ? "=".concat(v) : "", "'");
-  });
+  }).join(" ");
   return [(0, docker_1.createDockerBuildJobBase)(context, {
     variables: context.componentConfig.build.extraVars,
     // custom script
     script: [docker_1.gitlabDockerLogin, "docker pull $DOCKER_CACHE_IMAGE || true", "wget --output-document=- https://github.com/buildpacks/pack/releases/download/v".concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "/pack-v").concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "-linux.tgz | tar -zx --directory /usr/local/bin pack"), "chmod +x /usr/local/bin/pack",
     //  replace private git ssh gem sources with https to make bundler with credentials via env var work
-    "sed --in-place 's|git@\\([^:]*\\):|https://\\1/|g' Gemfile Gemfile.lock", "pack build \"$DOCKER_IMAGE:$DOCKER_IMAGE_TAG\" --builder '".concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.image, "' --publish --cache-image \"$DOCKER_CACHE_IMAGE\" ").concat(packEnvArgs.join(" "), " ").concat((_f = (_e = cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packExtraArgs) === null || _e === void 0 ? void 0 : _e.join(" ")) !== null && _f !== void 0 ? _f : "")]
+    "sed --in-place 's|git@\\([^:]*\\):|https://\\1/|g' Gemfile Gemfile.lock", "pack build \"$DOCKER_IMAGE:$DOCKER_IMAGE_TAG\" --builder '".concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.image, "' --publish --cache-image \"$DOCKER_CACHE_IMAGE\" ").concat(packEnvArgs, " ").concat((_c = (_b = cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packExtraArgs) === null || _b === void 0 ? void 0 : _b.join(" ")) !== null && _c !== void 0 ? _c : "")]
   })];
 };
 exports.createRailsBuildJobs = createRailsBuildJobs;
@@ -40112,7 +40108,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-d184a023" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-a38769c0" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),

package/dist/bundles/cli/index.js

@@ -351075,29 +351075,25 @@ exports.createRailsBuildJobs = void 0;
 var types_1 = __nccwpck_require__(71197);
 var docker_1 = __nccwpck_require__(33219);
 var createRailsBuildJobs = function (context) {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c;
   var buildConfig = context.componentConfig.build;
   if (!(0, types_1.isOfBuildType)(buildConfig, "rails")) {
     // should not happen
     throw new Error("build type is not rails");
   }
   var cnbConf = buildConfig.cnbBuilder;
-  // backwards compatabilty with CNB_ENV_VARS
-  // TODO: remove when all projects are migrated
-  var packEnvArgs = (_c = (_b = (_a = buildConfig.extraVars) === null || _a === void 0 ? void 0 : _a.CNB_ENV_VARS) === null || _b === void 0 ? void 0 : _b.split(" ").map(function (v) {
-    return "--env '".concat(v, "'");
-  })) !== null && _c !== void 0 ? _c : Object.entries((_d = cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.buildVars) !== null && _d !== void 0 ? _d : {}).map(function (_a) {
+  var packEnvArgs = Object.entries((_a = cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.buildVars) !== null && _a !== void 0 ? _a : {}).map(function (_a) {
     var _b = __read(_a, 2),
       k = _b[0],
       v = _b[1];
     return "--env '".concat(k).concat(v ? "=".concat(v) : "", "'");
-  });
+  }).join(" ");
   return [(0, docker_1.createDockerBuildJobBase)(context, {
     variables: context.componentConfig.build.extraVars,
     // custom script
     script: [docker_1.gitlabDockerLogin, "docker pull $DOCKER_CACHE_IMAGE || true", "wget --output-document=- https://github.com/buildpacks/pack/releases/download/v".concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "/pack-v").concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "-linux.tgz | tar -zx --directory /usr/local/bin pack"), "chmod +x /usr/local/bin/pack",
     //  replace private git ssh gem sources with https to make bundler with credentials via env var work
-    "sed --in-place 's|git@\\([^:]*\\):|https://\\1/|g' Gemfile Gemfile.lock", "pack build \"$DOCKER_IMAGE:$DOCKER_IMAGE_TAG\" --builder '".concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.image, "' --publish --cache-image \"$DOCKER_CACHE_IMAGE\" ").concat(packEnvArgs.join(" "), " ").concat((_f = (_e = cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packExtraArgs) === null || _e === void 0 ? void 0 : _e.join(" ")) !== null && _f !== void 0 ? _f : "")]
+    "sed --in-place 's|git@\\([^:]*\\):|https://\\1/|g' Gemfile Gemfile.lock", "pack build \"$DOCKER_IMAGE:$DOCKER_IMAGE_TAG\" --builder '".concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.image, "' --publish --cache-image \"$DOCKER_CACHE_IMAGE\" ").concat(packEnvArgs, " ").concat((_c = (_b = cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packExtraArgs) === null || _b === void 0 ? void 0 : _b.join(" ")) !== null && _c !== void 0 ? _c : "")]
   })];
 };
 exports.createRailsBuildJobs = createRailsBuildJobs;
@@ -351444,7 +351440,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-d184a023" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-a38769c0" || 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-d184a023",
+    "@catladder/pipeline": "0.0.0-main-a38769c0",
     "@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-d184a023",
+  "version": "0.0.0-main-a38769c0",
   "stableVersion": "0.0.0"
 }