@catladder/cli 0.0.0-main-24bccda4 → 0.0.0-main-582c181c

package/dist/bundles/catenv/index.js

@@ -38860,6 +38860,10 @@ var requiresDockerBuild = function (context) {
     return true;
   }
 
+  if ((0, deploy_1.isOfDeployType)(deployConfig, "dockerTag")) {
+    return true;
+  }
+
   return false;
 };
 
@@ -39818,7 +39822,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-24bccda4" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-582c181c" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -40720,8 +40724,7 @@ var getBaseDeploymentJob = function (context) {
   };
   var hasDocker = (0, docker_1.requiresDockerBuild)(context);
   var isStoppable = (0, utils_1.contextIsStoppable)(context);
-  var autoStop = context.environment.envType === "review" ? "3 days" // auto stop is not working properly when branch is merged, so we do
-  : context.environment.envType === "dev" ? "3 weeks" : undefined; // if auto or manual is configured explicitly, use that
+  var autoStop = context.environment.envType === "review" ? "2 week" : context.environment.envType === "dev" ? "4 weeks" : undefined; // if auto or manual is configured explicitly, use that
 
   var whenDeployDefined = context.componentConfig.deploy && context.componentConfig.deploy.when ? context.componentConfig.deploy.when : undefined; // otherwise auto deploy if env is not prod. If its prod, deploy automatically if stage is disabled
 
@@ -41067,8 +41070,6 @@ exports.createCustomDeployJobs = void 0;
 
 var lodash_1 = __nccwpck_require__(3255);
 
-var __1 = __nccwpck_require__(5355);
-
 var yarn_1 = __nccwpck_require__(464);
 
 var base_1 = __nccwpck_require__(9177);
@@ -41090,7 +41091,6 @@ var createCustomDeployJobs = function (context) {
   var baseDeploymentJob = (0, base_1.getBaseDeploymentJob)(context);
   var yarnInstall = (0, yarn_1.getYarnInstall)(context);
   return [(0, lodash_1.merge)({}, baseDeploymentJob, {
-    image: deployConfig.image ? (0, __1.getRunnerImage)(deployConfig.image) : undefined,
     script: __spreadArray(__spreadArray(["cd ".concat(context.componentConfig.dir)], __read(deployConfig.requiresYarnInstall ? yarnInstall : []), false), __read(deployConfig.script), false)
   })];
 };
@@ -41122,6 +41122,69 @@ exports.CUSTOM_DEPLOY_TYPE = {
 
 /***/ }),
 
+/***/ 7790:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+exports.__esModule = true;
+exports.createDockerTagDeployJobs = void 0;
+
+var lodash_1 = __nccwpck_require__(3255);
+
+var docker_1 = __nccwpck_require__(3219);
+
+var base_1 = __nccwpck_require__(9177);
+
+var types_1 = __nccwpck_require__(3109);
+
+var createDockerTagDeployJobs = function (context) {
+  var deployConfig = context.componentConfig.deploy;
+
+  if (deployConfig === false) {
+    return [];
+  }
+
+  if (!(0, types_1.isOfDeployType)(deployConfig, "dockerTag")) {
+    // should not happen
+    throw new Error("deploy config is not dockerTag");
+  }
+
+  var baseDeploymentJob = (0, base_1.getBaseDeploymentJob)(context);
+  var tag = deployConfig.tag;
+  return [(0, lodash_1.merge)({}, baseDeploymentJob, (0, docker_1.getDockerJobBaseProps)(context), {
+    script: [docker_1.gitlabDockerLogin, "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG", "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_IMAGE:".concat(tag), "docker push $DOCKER_IMAGE:".concat(tag), "echo \"pushed as $DOCKER_IMAGE:".concat(tag, "\"")]
+  })];
+};
+
+exports.createDockerTagDeployJobs = createDockerTagDeployJobs;
+
+/***/ }),
+
+/***/ 8990:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+exports.__esModule = true;
+exports.DOCKER_TAG_DEPLOY_TYPE = void 0;
+
+var deployJob_1 = __nccwpck_require__(7790);
+
+exports.DOCKER_TAG_DEPLOY_TYPE = {
+  jobs: deployJob_1.createDockerTagDeployJobs,
+  defaults: function () {
+    return {};
+  },
+  additionalSecretKeys: function () {
+    return [];
+  }
+};
+
+/***/ }),
+
 /***/ 223:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
@@ -41152,6 +41215,8 @@ var cloudRun_1 = __nccwpck_require__(1344);
 
 var custom_1 = __nccwpck_require__(5599);
 
+var dockerTag_1 = __nccwpck_require__(8990);
+
 var kubernetes_1 = __nccwpck_require__(5682);
 
 __exportStar(__nccwpck_require__(5682), exports);
@@ -41167,7 +41232,8 @@ __exportStar(__nccwpck_require__(1344), exports);
 exports.DEPLOY_TYPES = {
   kubernetes: kubernetes_1.KUBERNETES_DEPLOY_TYPE,
   custom: custom_1.CUSTOM_DEPLOY_TYPE,
-  "google-cloudrun": cloudRun_1.GCLOUD_RUN_DEPLOY_TYPE
+  "google-cloudrun": cloudRun_1.GCLOUD_RUN_DEPLOY_TYPE,
+  dockerTag: dockerTag_1.DOCKER_TAG_DEPLOY_TYPE
 };
 
 /***/ }),
@@ -41777,6 +41843,16 @@ exports.processSecretsAsFiles = processSecretsAsFiles;
 "use strict";
 
 
+exports.__esModule = true;
+
+/***/ }),
+
+/***/ 4738:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+
 exports.__esModule = true;
 
 /***/ }),
@@ -41823,6 +41899,8 @@ __exportStar(__nccwpck_require__(2689), exports);
 
 __exportStar(__nccwpck_require__(5299), exports);
 
+__exportStar(__nccwpck_require__(4738), exports);
+
 var isOfDeployType = function (t) {
   var types = [];
 

package/dist/bundles/cli/index.js

@@ -349734,6 +349734,10 @@ var requiresDockerBuild = function (context) {
     return true;
   }
 
+  if ((0, deploy_1.isOfDeployType)(deployConfig, "dockerTag")) {
+    return true;
+  }
+
   return false;
 };
 
@@ -350692,7 +350696,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-24bccda4" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-582c181c" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -351594,8 +351598,7 @@ var getBaseDeploymentJob = function (context) {
   };
   var hasDocker = (0, docker_1.requiresDockerBuild)(context);
   var isStoppable = (0, utils_1.contextIsStoppable)(context);
-  var autoStop = context.environment.envType === "review" ? "3 days" // auto stop is not working properly when branch is merged, so we do
-  : context.environment.envType === "dev" ? "3 weeks" : undefined; // if auto or manual is configured explicitly, use that
+  var autoStop = context.environment.envType === "review" ? "2 week" : context.environment.envType === "dev" ? "4 weeks" : undefined; // if auto or manual is configured explicitly, use that
 
   var whenDeployDefined = context.componentConfig.deploy && context.componentConfig.deploy.when ? context.componentConfig.deploy.when : undefined; // otherwise auto deploy if env is not prod. If its prod, deploy automatically if stage is disabled
 
@@ -351941,8 +351944,6 @@ exports.createCustomDeployJobs = void 0;
 
 var lodash_1 = __nccwpck_require__(23255);
 
-var __1 = __nccwpck_require__(25355);
-
 var yarn_1 = __nccwpck_require__(10464);
 
 var base_1 = __nccwpck_require__(89177);
@@ -351964,7 +351965,6 @@ var createCustomDeployJobs = function (context) {
   var baseDeploymentJob = (0, base_1.getBaseDeploymentJob)(context);
   var yarnInstall = (0, yarn_1.getYarnInstall)(context);
   return [(0, lodash_1.merge)({}, baseDeploymentJob, {
-    image: deployConfig.image ? (0, __1.getRunnerImage)(deployConfig.image) : undefined,
     script: __spreadArray(__spreadArray(["cd ".concat(context.componentConfig.dir)], __read(deployConfig.requiresYarnInstall ? yarnInstall : []), false), __read(deployConfig.script), false)
   })];
 };
@@ -351996,6 +351996,69 @@ exports.CUSTOM_DEPLOY_TYPE = {
 
 /***/ }),
 
+/***/ 27790:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+exports.__esModule = true;
+exports.createDockerTagDeployJobs = void 0;
+
+var lodash_1 = __nccwpck_require__(23255);
+
+var docker_1 = __nccwpck_require__(33219);
+
+var base_1 = __nccwpck_require__(89177);
+
+var types_1 = __nccwpck_require__(63109);
+
+var createDockerTagDeployJobs = function (context) {
+  var deployConfig = context.componentConfig.deploy;
+
+  if (deployConfig === false) {
+    return [];
+  }
+
+  if (!(0, types_1.isOfDeployType)(deployConfig, "dockerTag")) {
+    // should not happen
+    throw new Error("deploy config is not dockerTag");
+  }
+
+  var baseDeploymentJob = (0, base_1.getBaseDeploymentJob)(context);
+  var tag = deployConfig.tag;
+  return [(0, lodash_1.merge)({}, baseDeploymentJob, (0, docker_1.getDockerJobBaseProps)(context), {
+    script: [docker_1.gitlabDockerLogin, "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG", "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_IMAGE:".concat(tag), "docker push $DOCKER_IMAGE:".concat(tag), "echo \"pushed as $DOCKER_IMAGE:".concat(tag, "\"")]
+  })];
+};
+
+exports.createDockerTagDeployJobs = createDockerTagDeployJobs;
+
+/***/ }),
+
+/***/ 18990:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+exports.__esModule = true;
+exports.DOCKER_TAG_DEPLOY_TYPE = void 0;
+
+var deployJob_1 = __nccwpck_require__(27790);
+
+exports.DOCKER_TAG_DEPLOY_TYPE = {
+  jobs: deployJob_1.createDockerTagDeployJobs,
+  defaults: function () {
+    return {};
+  },
+  additionalSecretKeys: function () {
+    return [];
+  }
+};
+
+/***/ }),
+
 /***/ 90223:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
@@ -352026,6 +352089,8 @@ var cloudRun_1 = __nccwpck_require__(81344);
 
 var custom_1 = __nccwpck_require__(75599);
 
+var dockerTag_1 = __nccwpck_require__(18990);
+
 var kubernetes_1 = __nccwpck_require__(95682);
 
 __exportStar(__nccwpck_require__(95682), exports);
@@ -352041,7 +352106,8 @@ __exportStar(__nccwpck_require__(81344), exports);
 exports.DEPLOY_TYPES = {
   kubernetes: kubernetes_1.KUBERNETES_DEPLOY_TYPE,
   custom: custom_1.CUSTOM_DEPLOY_TYPE,
-  "google-cloudrun": cloudRun_1.GCLOUD_RUN_DEPLOY_TYPE
+  "google-cloudrun": cloudRun_1.GCLOUD_RUN_DEPLOY_TYPE,
+  dockerTag: dockerTag_1.DOCKER_TAG_DEPLOY_TYPE
 };
 
 /***/ }),
@@ -352651,6 +352717,16 @@ exports.processSecretsAsFiles = processSecretsAsFiles;
 "use strict";
 
 
+exports.__esModule = true;
+
+/***/ }),
+
+/***/ 84738:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+
 exports.__esModule = true;
 
 /***/ }),
@@ -352697,6 +352773,8 @@ __exportStar(__nccwpck_require__(22689), exports);
 
 __exportStar(__nccwpck_require__(15299), exports);
 
+__exportStar(__nccwpck_require__(84738), exports);
+
 var isOfDeployType = function (t) {
   var types = [];