@catladder/cli 0.0.0-refactor-image-ca767657 → 0.0.0-refactor-gcloud-auth-no-file-b43bf0d9

package/dist/bundles/catenv/index.js

@@ -39131,7 +39131,6 @@ exports.RUNNER_BUILD_RESOURCE_VARIABLES = exports.APP_BUILD_JOB_NAME = void 0;
 exports.APP_BUILD_JOB_NAME = "🔨 app";
 exports.RUNNER_BUILD_RESOURCE_VARIABLES = {
   KUBERNETES_CPU_REQUEST: "0.5",
-  KUBERNETES_CPU_LIMIT: "2",
   KUBERNETES_MEMORY_REQUEST: "1Gi",
   KUBERNETES_MEMORY_LIMIT: "4Gi"
 };
@@ -39487,7 +39486,6 @@ var types_1 = __nccwpck_require__(1197);
 var base_1 = __nccwpck_require__(8035);
 var RUNNER_BUILD_VARIABLES = {
   KUBERNETES_CPU_REQUEST: "0.5",
-  KUBERNETES_CPU_LIMIT: "2",
   KUBERNETES_MEMORY_REQUEST: "2Gi",
   KUBERNETES_MEMORY_LIMIT: "4Gi"
 };
@@ -39512,7 +39510,7 @@ var createCustomBuildJobs = function (context) {
       }
     } : undefined,
     dockerBuild: {
-      script: (0, docker_1.getDockerBuildDefaultScript)(((_d = buildConfig.docker) === null || _d === void 0 ? void 0 : _d.type) === "nginx" ? "ensureNginxDockerfile" : ""),
+      script: (0, docker_1.getDockerBuildDefaultScript)(context, ((_d = buildConfig.docker) === null || _d === void 0 ? void 0 : _d.type) === "nginx" ? "ensureNginxDockerfile" : ""),
       variables: {}
     }
   });
@@ -39623,7 +39621,6 @@ var types_1 = __nccwpck_require__(1197);
 var createArtifactsConfig_1 = __nccwpck_require__(5669);
 var RUNNER_CUSTOM_TEST_VARIABLES = {
   KUBERNETES_CPU_REQUEST: "0.5",
-  KUBERNETES_CPU_LIMIT: "2",
   KUBERNETES_MEMORY_REQUEST: "2Gi",
   KUBERNETES_MEMORY_LIMIT: "4Gi"
 };
@@ -39697,26 +39694,73 @@ var __rest = this && this.__rest || function (s, e) {
   }
   return t;
 };
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+    r,
+    ar = [],
+    e;
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+  return ar;
+};
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
+var __importDefault = this && this.__importDefault || function (mod) {
+  return mod && mod.__esModule ? mod : {
+    "default": mod
+  };
+};
 exports.__esModule = true;
-exports.getDockerBuildDefaultScript = exports.gitlabDockerLogin = exports.createDockerBuildJobBase = exports.getDockerJobBaseProps = exports.DOCKER_BUILD_JOB_NAME = exports.getDockerBuildVariables = exports.requiresDockerBuild = exports.getDockerImageVariables = void 0;
+exports.hasDockerfile = exports.getDockerBuildDefaultScript = exports.gitlabDockerLogin = exports.createDockerBuildJobBase = exports.getDockerJobBaseProps = exports.DOCKER_BUILD_JOB_NAME = exports.getDockerBuildVariables = exports.requiresDockerBuild = exports.getDockerImageVariables = void 0;
 var lodash_1 = __nccwpck_require__(3255);
 var deploy_1 = __nccwpck_require__(223);
 var runner_1 = __nccwpck_require__(5071);
+var fs_1 = __nccwpck_require__(7147);
+var path_1 = __importDefault(__nccwpck_require__(1017));
+var gitlab_1 = __nccwpck_require__(4997);
+var artifactsRegistry_1 = __nccwpck_require__(8159);
+var gcloudServiceAccountLoginCommands_1 = __nccwpck_require__(2607);
 var DOCKER_RUNNER_BUILD_VARIABLES = {
   KUBERNETES_CPU_REQUEST: "0.5",
-  KUBERNETES_CPU_LIMIT: "1",
   KUBERNETES_MEMORY_REQUEST: "1Gi",
   KUBERNETES_MEMORY_LIMIT: "2Gi"
 };
 var getDockerImageVariables = function (context) {
-  return {
+  return __assign(__assign({}, (0, deploy_1.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun") ? {
+    DOCKER_REGISTRY: (0, artifactsRegistry_1.getArtifactsRegistryHost)(context),
+    DOCKER_IMAGE: (0, artifactsRegistry_1.getArtifactsRegistryImageName)(context),
+    DOCKER_CACHE_IMAGE: (0, artifactsRegistry_1.getArtifactsRegistryBuildCacheImage)(context)
+  } :
+  // gitlab registry:
+  {
     DOCKER_REGISTRY: "$CI_REGISTRY",
-    DOCKER_REGISTRY_IMAGE_PATH: "$CI_REGISTRY_IMAGE",
-    DOCKER_CACHE_IMAGE: "$DOCKER_REGISTRY_IMAGE_PATH/caches/" + context.componentName,
+    DOCKER_CACHE_IMAGE: "$CI_REGISTRY_IMAGE/caches/" + context.componentName,
+    // ONLY USED IN KUBERNETES
     DOCKER_IMAGE_NAME: context.environment.shortName + "/" + context.componentName,
-    DOCKER_IMAGE: "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
+    DOCKER_IMAGE: "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME"
+  }), {
     DOCKER_IMAGE_TAG: "$CI_COMMIT_SHA"
-  };
+  });
 };
 exports.getDockerImageVariables = getDockerImageVariables;
 /**
@@ -39750,7 +39794,7 @@ var getDockerJobBaseProps = function (context) {
   return {
     image: (0, runner_1.getRunnerImage)("docker-build"),
     services: [{
-      name: "docker:20-dind",
+      name: "docker:24.0.6-dind",
       command: ["--tls=false"]
     }],
     variables: getDockerBaseVariables()
@@ -39771,11 +39815,19 @@ var createDockerBuildJobBase = function (context, _a) {
   }, def);
 };
 exports.createDockerBuildJobBase = createDockerBuildJobBase;
-exports.gitlabDockerLogin = "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY";
-var getDockerBuildDefaultScript = function (ensureDockerFileScript) {
-  return [ensureDockerFileScript, exports.gitlabDockerLogin, "docker version", "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile . --build-arg BUILDKIT_INLINE_CACHE=1", "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG", "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE", "docker push $DOCKER_CACHE_IMAGE"].filter(Boolean);
+var gitlabDockerLogin = function (context) {
+  return (0, deploy_1.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun") ? __spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), ["gcloud auth configure-docker ".concat((0, artifactsRegistry_1.getArtifactsRegistryHost)(context))], false) : ["docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY"];
+};
+exports.gitlabDockerLogin = gitlabDockerLogin;
+var getDockerBuildDefaultScript = function (context, ensureDockerFileScript) {
+  return __spreadArray(__spreadArray(__spreadArray([ensureDockerFileScript], __read((0, gitlab_1.collapseableSection)("docker-login", "Docker Login")((0, exports.gitlabDockerLogin)(context))), false), __read((0, gitlab_1.collapseableSection)("docker-build", "Docker build")(["docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile . --build-arg BUILDKIT_INLINE_CACHE=1" //BUILDKIT_INLINE_CACHE,  see https://testdriven.io/blog/faster-ci-builds-with-docker-cache/
+  ])), false), __read((0, gitlab_1.collapseableSection)("docker-push", "Docker push and tag")(["docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG", "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE", "docker push $DOCKER_CACHE_IMAGE"])), false).filter(Boolean);
 };
 exports.getDockerBuildDefaultScript = getDockerBuildDefaultScript;
+var hasDockerfile = function (context) {
+  return (0, fs_1.existsSync)(path_1["default"].join(context.componentConfig.dir, "Dockerfile"));
+};
+exports.hasDockerfile = hasDockerfile;
 
 /***/ }),
 
@@ -39853,8 +39905,8 @@ exports.BUILD_TYPES = {
       return {
         startCommand: "/cnb/process/web",
         cnbBuilder: {
-          image: "heroku/buildpacks:20",
-          packVersion: "0.28.0"
+          image: "heroku/builder:22",
+          packVersion: "0.32.1"
         }
       };
     }
@@ -39936,15 +39988,19 @@ var createNodeBuildJobs = function (context) {
       cache: __spreadArray(__spreadArray(__spreadArray([], __read((_b = (0, utils_1.ensureArray)(buildConfig.jobCache)) !== null && _b !== void 0 ? _b : []), false), __read((0, cache_1.getNodeCache)(context)), false), __read((0, cache_1.getNextCache)(context)), false),
       script: __spreadArray(__spreadArray([], __read(yarnInstall), false), __read((_c = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _c !== void 0 ? _c : []), false),
       artifacts: {
-        paths: __spreadArray([(0, path_1.join)(context.componentConfig.dir, "__build_info.json"), (0, path_1.join)(context.componentConfig.dir, "dist"), (0, path_1.join)(context.componentConfig.dir, ".next")], __read((_e = (_d = buildConfig.artifactsPaths) === null || _d === void 0 ? void 0 : _d.map(function (path) {
-          return (0, path_1.join)(context.componentConfig.dir, path);
-        })) !== null && _e !== void 0 ? _e : []), false),
-        expire_in: "1 day"
+        paths: __spreadArray([context.componentConfig.dir], __read((_e = (_d = context.packageManagerInfo) === null || _d === void 0 ? void 0 : _d.currentWorkspaceDependencies) !== null && _e !== void 0 ? _e : []), false).flatMap(function (dir) {
+          var _a, _b;
+          return __spreadArray([(0, path_1.join)(dir, "__build_info.json"), (0, path_1.join)(dir, "dist"), (0, path_1.join)(dir, ".next")], __read((_b = (_a = buildConfig.artifactsPaths) === null || _a === void 0 ? void 0 : _a.map(function (path) {
+            return (0, path_1.join)(dir, path);
+          })) !== null && _b !== void 0 ? _b : []), false);
+        }),
+        expire_in: "1 day",
+        when: "always"
       },
       jobTags: buildConfig.jobTags
     } : undefined,
     dockerBuild: {
-      script: (0, docker_1.getDockerBuildDefaultScript)(buildConfig.type === "node-static" || buildConfig.type === "storybook" ? "ensureNginxDockerfile" : "ensureNodeDockerfile"),
+      script: (0, docker_1.getDockerBuildDefaultScript)(context, buildConfig.type === "node-static" || buildConfig.type === "storybook" ? "ensureNginxDockerfile" : "ensureNodeDockerfile"),
       cache: __spreadArray([], __read((0, cache_1.getYarnCache)(context, "pull")), false),
       variables: {
         // only required for non static
@@ -40006,6 +40062,7 @@ exports.__esModule = true;
 exports.getNextCache = exports.getNodeCache = exports.getNodeModulesCache = exports.getYarnCache = void 0;
 var path_1 = __nccwpck_require__(1017);
 var slugify_1 = __importDefault(__nccwpck_require__(4035));
+var lodash_1 = __nccwpck_require__(3255);
 var getYarnCache = function (context, policy) {
   var _a;
   if (policy === void 0) {
@@ -40035,9 +40092,9 @@ var getNodeModulesCache = function (context, policy) {
     // if component is in a shared workspace, use workspace cache. use individual cache else
     key: componentIsInWorkspace ? "node-modules-workspace" : (0, slugify_1["default"])(context.componentConfig.dir) + "-node-modules",
     policy: policy,
-    paths: __spreadArray([], __read(componentIsInWorkspace ? __spreadArray(["node_modules"], __read((_c = (_b = context.packageManagerInfo) === null || _b === void 0 ? void 0 : _b.workspaces.map(function (w) {
+    paths: __spreadArray([], __read(componentIsInWorkspace ? (0, lodash_1.uniq)(__spreadArray(["node_modules"], __read((_c = (_b = context.packageManagerInfo) === null || _b === void 0 ? void 0 : _b.workspaces.map(function (w) {
       return (0, path_1.join)(w.location, "node_modules");
-    })) !== null && _c !== void 0 ? _c : []), false) : [(0, path_1.join)(context.componentConfig.dir, "node_modules")]), false)
+    })) !== null && _c !== void 0 ? _c : []), false)) : [(0, path_1.join)(context.componentConfig.dir, "node_modules")]), false)
   }];
 };
 exports.getNodeModulesCache = getNodeModulesCache;
@@ -40069,7 +40126,6 @@ exports.__esModule = true;
 exports.NODE_RUNNER_BUILD_VARIABLES = void 0;
 exports.NODE_RUNNER_BUILD_VARIABLES = {
   KUBERNETES_CPU_REQUEST: "0.5",
-  KUBERNETES_CPU_LIMIT: "2",
   KUBERNETES_MEMORY_REQUEST: "2Gi",
   KUBERNETES_MEMORY_LIMIT: "4Gi"
 };
@@ -40205,7 +40261,7 @@ var createMeteorBuildJobs = function (context) {
       }
     } : undefined,
     dockerBuild: {
-      script: (0, docker_1.getDockerBuildDefaultScript)("ensureMeteorDockerfile"),
+      script: (0, docker_1.getDockerBuildDefaultScript)(context, "ensureMeteorDockerfile"),
       variables: {
         METEOR_INSTALL_SCRIPTS: buildConfig.installScripts ? "true" : ""
       }
@@ -40302,14 +40358,14 @@ var createNodeTestJobs = function (context) {
   }, base), {
     image: (_l = (_k = buildConfig.lint) === null || _k === void 0 ? void 0 : _k.jobImage) !== null && _l !== void 0 ? _l : defaultImage,
     cache: (0, cache_1.getNodeCache)(context),
-    script: __spreadArray(__spreadArray(["cd ".concat(context.componentConfig.dir)], __read(yarnInstall), false), __read((_o = (0, utils_1.ensureArray)((_m = buildConfig.lint) === null || _m === void 0 ? void 0 : _m.command)) !== null && _o !== void 0 ? _o : ["yarn lint"]), false)
+    script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, yarn_1.ensureNodeVersion)(context)), false), ["cd ".concat(context.componentConfig.dir)], false), __read(yarnInstall), false), __read((_o = (0, utils_1.ensureArray)((_m = buildConfig.lint) === null || _m === void 0 ? void 0 : _m.command)) !== null && _o !== void 0 ? _o : ["yarn lint"]), false)
   }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.componentConfig.dir, (_p = buildConfig.lint) === null || _p === void 0 ? void 0 : _p.artifactsReports, (_q = buildConfig.lint) === null || _q === void 0 ? void 0 : _q.artifacts)) : null;
   var testJob = buildConfig.test !== false ? __assign(__assign(__assign({
     name: "🧪 test"
   }, base), {
     image: (_s = (_r = buildConfig.test) === null || _r === void 0 ? void 0 : _r.jobImage) !== null && _s !== void 0 ? _s : (0, runner_1.getRunnerImage)("jobs-testing-chrome"),
     cache: (0, cache_1.getNodeCache)(context),
-    script: __spreadArray(__spreadArray(["cd ".concat(context.componentConfig.dir)], __read(yarnInstall), false), __read((_u = (0, utils_1.ensureArray)((_t = buildConfig.test) === null || _t === void 0 ? void 0 : _t.command)) !== null && _u !== void 0 ? _u : ["yarn test"]), false)
+    script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, yarn_1.ensureNodeVersion)(context)), false), ["cd ".concat(context.componentConfig.dir)], false), __read(yarnInstall), false), __read((_u = (0, utils_1.ensureArray)((_t = buildConfig.test) === null || _t === void 0 ? void 0 : _t.command)) !== null && _u !== void 0 ? _u : ["yarn test"]), false)
   }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.componentConfig.dir, (_v = buildConfig.test) === null || _v === void 0 ? void 0 : _v.artifactsReports, (_w = buildConfig.test) === null || _w === void 0 ? void 0 : _w.artifacts)) : null;
   return [auditJob, lintJob, testJob].filter(utils_1.notNil);
 };
@@ -40357,6 +40413,7 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
 exports.__esModule = true;
 exports.getDockerAppCopyAndBuildScript = exports.getYarnInstall = exports.ensureNodeVersion = void 0;
 var utils_1 = __nccwpck_require__(7461);
+var gitlab_1 = __nccwpck_require__(4997);
 var YARN_INSTALL_CLASSIC = "yarn install --frozen-lockfile";
 // FIXME: check why and when rebuild is needed
 var YARN_BERRY_PROD_REBUILD = "yarn workspaces focus --production && yarn rebuild";
@@ -40368,13 +40425,13 @@ var getYarnInstallCommand = function (context) {
   return "yarn install --immutable";
 };
 var ensureNodeVersion = function (context) {
-  return ["if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi", "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi"];
+  return (0, gitlab_1.collapseableSection)("nodeinstall", "Ensure node version")(["if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi", "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi"]);
 };
 exports.ensureNodeVersion = ensureNodeVersion;
 var getYarnInstall = function (context, options) {
   var _a;
   var postInstall = "postInstall" in context.componentConfig.build ? context.componentConfig.build.postInstall : null;
-  return __spreadArray(__spreadArray(__spreadArray([], __read((0, exports.ensureNodeVersion)(context)), false), [getYarnInstallCommand(context)], false), __read(postInstall && !(options === null || options === void 0 ? void 0 : options.noCustomPostInstall) ? (_a = (0, utils_1.ensureArray)(postInstall)) !== null && _a !== void 0 ? _a : [] : []), false);
+  return __spreadArray(__spreadArray(__spreadArray([], __read((0, exports.ensureNodeVersion)(context)), false), __read((0, gitlab_1.collapseableSection)("yarninstall", "Yarn install")([getYarnInstallCommand(context)])), false), __read(postInstall && !(options === null || options === void 0 ? void 0 : options.noCustomPostInstall) ? (0, gitlab_1.collapseableSection)("postinstall", "Custom post install")((_a = (0, utils_1.ensureArray)(postInstall)) !== null && _a !== void 0 ? _a : []) : []), false);
 };
 exports.getYarnInstall = getYarnInstall;
 var DOCKER_COPY_FILES = "COPY --chown=node:node $APP_DIR .";
@@ -40436,6 +40493,15 @@ var __read = this && this.__read || function (o, n) {
   }
   return ar;
 };
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
 exports.__esModule = true;
 exports.createRailsBuildJobs = void 0;
 var base_1 = __nccwpck_require__(8035);
@@ -40448,6 +40514,15 @@ var createRailsBuildJobs = function (context) {
     // should not happen
     throw new Error("build type is not rails");
   }
+  if ((0, docker_1.hasDockerfile)(context)) {
+    return (0, base_1.createBuildJobs)(context, {
+      appBuild: undefined,
+      dockerBuild: {
+        script: (0, docker_1.getDockerBuildDefaultScript)(context),
+        variables: {}
+      }
+    });
+  }
   var cnbConf = buildConfig.cnbBuilder;
   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),
@@ -40460,9 +40535,9 @@ var createRailsBuildJobs = function (context) {
     dockerBuild: {
       variables: __assign(__assign({}, context.environment.jobOnlyVars.build.envVars), 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",
+      script: __spreadArray(__spreadArray([], __read((0, docker_1.gitlabDockerLogin)(context)), false), ["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, " ").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 : "")]
+      "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 : "")], false)
     }
   });
 };
@@ -40845,7 +40920,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "refactor-image-ca767657" || 0;
+exports.PIPELINE_IMAGE_TAG = "refactor-gcloud-auth-no-file-b43bf0d9" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -41276,7 +41351,7 @@ var getEnvironmentVariables = function (config, componentName, env, commitInfo,
     alreadyVisited = {};
   }
   return __awaiter(void 0, void 0, void 0, function () {
-    var environmentContext, envConfigRaw, deployConfigRaw, buildConfigRaw, envType, basePredefinedVariables, predefinedVariables, host, url, devLocalConfig, port, additionalEnvVars, publicEnvVarsRaw, additionalSecretKeys, secretEnvVarKeys, secretEnvVars, legacyFromComponents, publicEnvVarsRawWithLegacyFromComponents, publicEnvVarsRawSanitized, envVarsRaw, envVars;
+    var environmentContext, envConfigRaw, deployConfigRaw, buildConfigRaw, envType, basePredefinedVariables, predefinedVariables, host, url, devLocalConfig, port, additionalEnvVars, HOST_INTERNAL, publicEnvVarsRaw, additionalSecretKeys, secretEnvVarKeys, secretEnvVars, legacyFromComponents, publicEnvVarsRawWithLegacyFromComponents, publicEnvVarsRawSanitized, envVarsRaw, envVars;
     var _a, _b;
     var _c, _d, _e, _f, _g, _h, _j, _k, _l;
     return __generator(this, function (_m) {
@@ -41300,16 +41375,21 @@ var getEnvironmentVariables = function (config, componentName, env, commitInfo,
             predefinedVariables = {
               ENV_SHORT: "local",
               ROOT_URL: url,
+              HOST_INTERNAL: host,
+              ROOT_URL_INTERNAL: "http://" + host,
               PORT: port.toString()
             };
           } else {
             additionalEnvVars = deployConfigRaw ? deploy_1.DEPLOY_TYPES[deployConfigRaw.type].getAdditionalEnvVars(environmentContext) : {};
-            host = (_e = (_d = envConfigRaw === null || envConfigRaw === void 0 ? void 0 : envConfigRaw.host) !== null && _d !== void 0 ? _d : additionalEnvVars.HOST_CANONICAL) !== null && _e !== void 0 ? _e : "unknown-host.example.com";
+            HOST_INTERNAL = (_d = additionalEnvVars.HOST_INTERNAL) !== null && _d !== void 0 ? _d : "unknown-host.example.com";
+            host = (_e = envConfigRaw === null || envConfigRaw === void 0 ? void 0 : envConfigRaw.host) !== null && _e !== void 0 ? _e : HOST_INTERNAL;
             url = "https://".concat(host);
             predefinedVariables = __assign(__assign(__assign(__assign({}, basePredefinedVariables), config.components[componentName].build.type === "rails" ? {} : {
               HOST: host
             }), {
-              ROOT_URL: url
+              ROOT_URL: url,
+              HOST_CANONICAL: HOST_INTERNAL,
+              ROOT_URL_INTERNAL: "https://" + HOST_INTERNAL
             }), additionalEnvVars);
           }
           publicEnvVarsRaw = (_g = (_f = envConfigRaw.vars) === null || _f === void 0 ? void 0 : _f.public) !== null && _g !== void 0 ? _g : {};
@@ -42160,7 +42240,7 @@ var createDeployJob = function (context, jobDefinition) {
   var _a, _b, _c, _d;
   var hasDocker = (0, docker_1.requiresDockerBuild)(context);
   var isStoppable = (0, utils_1.contextIsStoppable)(context);
-  var autoStop = context.environment.envType === "review" ? "2 week" : context.environment.envType === "dev" ? "4 weeks" : undefined;
+  var autoStop = context.environment.envType === "review" ? "1 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
@@ -42364,13 +42444,269 @@ exports.__esModule = true;
 exports.DEPLOY_RUNNER_VARIABLES = void 0;
 exports.DEPLOY_RUNNER_VARIABLES = {
   KUBERNETES_CPU_REQUEST: "0.5",
-  KUBERNETES_CPU_LIMIT: "1",
   KUBERNETES_MEMORY_REQUEST: "200Mi",
   KUBERNETES_MEMORY_LIMIT: "400Mi"
 };
 
 /***/ }),
 
+/***/ 8159:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+    r,
+    ar = [],
+    e;
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+  return ar;
+};
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
+exports.__esModule = true;
+exports.getDeleteUnusedImagesCommands = exports.getArtifactsRegistryImage = exports.getArtifactsRegistryBuildCacheImage = exports.getArtifactsRegistryImageName = exports.getArtifactsRegistryDockerUrl = exports.getArtifactsRegistryHost = void 0;
+var gitlab_1 = __nccwpck_require__(4997);
+var types_1 = __nccwpck_require__(3109);
+var removeFirstLinesFromCommandOutput_1 = __nccwpck_require__(7547);
+var getArtifactsRegistryHost = function (_a) {
+  var deploy = _a.componentConfig.deploy;
+  if (!(0, types_1.isOfDeployType)(deploy, "google-cloudrun")) {
+    // should not happen
+    throw new Error("deploy config is wrong");
+  }
+  return "".concat(deploy.region, "-docker.pkg.dev");
+};
+exports.getArtifactsRegistryHost = getArtifactsRegistryHost;
+var getArtifactsRegistryDockerUrl = function (context) {
+  var deployConfig = context.componentConfig.deploy;
+  if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
+    // should not happen
+    throw new Error("deploy config is wrong");
+  }
+  var fullAppName = "".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName);
+  return "".concat((0, exports.getArtifactsRegistryHost)(context), "/").concat(deployConfig.projectId, "/catladder-deploy/").concat(fullAppName);
+};
+exports.getArtifactsRegistryDockerUrl = getArtifactsRegistryDockerUrl;
+/**
+ *
+ * lecacyReviewImageName is only temporary. In old versions the images had no reviewslug in review apps, which makes cleanup harder. We delete all those images now, but need the path
+ */
+var getArtifactsRegistryImageName = function (context, lecacyReviewImageName) {
+  var _a;
+  if (lecacyReviewImageName === void 0) {
+    lecacyReviewImageName = false;
+  }
+  if (lecacyReviewImageName && context.environment.envType !== "review") {
+    throw new Error("lecacyReviewImageName is only allowed for review app");
+  }
+  var dockerUrl = (0, exports.getArtifactsRegistryDockerUrl)(context);
+  var gcloudImagePath = __spreadArray([dockerUrl, context.environment.shortName, context.componentName], __read(context.environment.envType === "review" && !lecacyReviewImageName ? [(_a = context.commitInfo) === null || _a === void 0 ? void 0 : _a.reviewSlug] : []), false);
+  return gcloudImagePath.join("/");
+};
+exports.getArtifactsRegistryImageName = getArtifactsRegistryImageName;
+var getArtifactsRegistryBuildCacheImage = function (context) {
+  var dockerUrl = (0, exports.getArtifactsRegistryDockerUrl)(context);
+  // does not include env, so that after merge, you might get more cache hits (review-->dev)
+  var gcloudImagePath = [dockerUrl, "caches", context.componentName];
+  return gcloudImagePath.join("/");
+};
+exports.getArtifactsRegistryBuildCacheImage = getArtifactsRegistryBuildCacheImage;
+var getArtifactsRegistryImage = function (context) {
+  return "".concat((0, exports.getArtifactsRegistryImageName)(context), ":$DOCKER_IMAGE_TAG");
+};
+exports.getArtifactsRegistryImage = getArtifactsRegistryImage;
+var getDeleteImageCommands = function (fullImageName, keepNewest) {
+  if (keepNewest === void 0) {
+    keepNewest = 0;
+  }
+  if (keepNewest === 0) {
+    // no need to list tags, we delete the whole thing
+    return ["gcloud artifacts docker images delete ".concat(fullImageName, " --quiet --delete-tags")];
+  }
+  // delete unused tags
+  var listAllImagesCommand = "gcloud artifacts docker images list ".concat(fullImageName, " --sort-by=~CREATE_TIME --format=\"value(version)\"");
+  var listImagesToDeletecommand = (0, removeFirstLinesFromCommandOutput_1.removeFirstLinesFromCommandOutput)(listAllImagesCommand, keepNewest);
+  var deleteImageCommand = "gcloud artifacts docker images delete ".concat(fullImageName, "@$version --quiet --delete-tags");
+  var deleteImagesCommand = "".concat(listImagesToDeletecommand, " | while read -r version; do ").concat(deleteImageCommand, "; done");
+  return [deleteImagesCommand];
+};
+/**
+ * commands to delete unused images.
+ *
+ * @param context
+ * @param keep how many of the newest images to keep
+ * @returns
+ */
+var getDeleteUnusedImagesCommands = function (context, keep) {
+  if (keep === void 0) {
+    keep = 0;
+  }
+  var deployConfig = context.componentConfig.deploy;
+  if (deployConfig === false) {
+    return [];
+  }
+  if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
+    // should not happen
+    throw new Error("deploy config is wrong");
+  }
+  var fullImageName = (0, exports.getArtifactsRegistryImageName)(context);
+  var buildCacheImageName = (0, exports.getArtifactsRegistryBuildCacheImage)(context);
+  return __spreadArray(__spreadArray(__spreadArray([], __read(getDeleteImageCommands(fullImageName, keep)), false), __read(getDeleteImageCommands(buildCacheImageName, 1)), false), __read(context.environment.envType === "review" ? (0, gitlab_1.allowFailureInScripts)(getDeleteImageCommands((0, exports.getArtifactsRegistryImageName)(context, true), 0)) : []), false);
+};
+exports.getDeleteUnusedImagesCommands = getDeleteUnusedImagesCommands;
+
+/***/ }),
+
+/***/ 964:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+    r,
+    ar = [],
+    e;
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+  return ar;
+};
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
+exports.__esModule = true;
+exports.getRemoveOldRevisionsAndImagesCommand = void 0;
+var artifactsRegistry_1 = __nccwpck_require__(8159);
+var cloudRunRevisions_1 = __nccwpck_require__(1101);
+var getRemoveOldRevisionsAndImagesCommand = function (context, when) {
+  if (when === "onStop") {
+    // service is already deleted, so we don't need to delete old revisions, just delete all images
+    return (0, artifactsRegistry_1.getDeleteUnusedImagesCommands)(context);
+  }
+  // this number only targets inactive revisions
+  var revisionsToKeep = context.environment.envType === "prod" ? 5 : 0;
+  // this number needs to be higher than inactive after deploy, so we add one
+  var imagesToKeep = revisionsToKeep + 1;
+  var deleteOldRevisionsCommands = (0, cloudRunRevisions_1.getDeleteUnusedRevisionsCommands)(context, revisionsToKeep);
+  var deleteOldImagesCommands = (0, artifactsRegistry_1.getDeleteUnusedImagesCommands)(context, imagesToKeep);
+  return __spreadArray(__spreadArray([], __read(deleteOldRevisionsCommands), false), __read(deleteOldImagesCommands), false);
+};
+exports.getRemoveOldRevisionsAndImagesCommand = getRemoveOldRevisionsAndImagesCommand;
+
+/***/ }),
+
+/***/ 1101:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+
+var __assign = this && this.__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+    }
+    return t;
+  };
+  return __assign.apply(this, arguments);
+};
+exports.__esModule = true;
+exports.getDeleteUnusedRevisionsCommands = void 0;
+var types_1 = __nccwpck_require__(3109);
+var createArgsString_1 = __nccwpck_require__(8686);
+var getServiceName_1 = __nccwpck_require__(9391);
+var removeFirstLinesFromCommandOutput_1 = __nccwpck_require__(7547);
+var getListRevisionsCommand = function (context, args) {
+  var serviceName = (0, getServiceName_1.getServiceName)(context);
+  var deployConfig = context.componentConfig.deploy;
+  if (!deployConfig || !(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
+    // should not happen
+    throw new Error("deploy config is wrong");
+  }
+  var filterRevisionArgs = __assign({
+    project: deployConfig.projectId,
+    region: deployConfig.region,
+    // only show inactive revisions
+    service: serviceName,
+    limit: "unlimited",
+    "sort-by": "metadata.creationTimestamp"
+  }, args);
+  // this prints out all inactive images of the given app
+  return "gcloud run revisions list ".concat((0, createArgsString_1.createArgsString)(filterRevisionArgs));
+};
+var getDeleteUnusedRevisionsCommands = function (context, keep) {
+  var deployConfig = context.componentConfig.deploy;
+  if (deployConfig === false) {
+    return [];
+  }
+  if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
+    // should not happen
+    throw new Error("deploy config is wrong");
+  }
+  // this prints out all inactive images of the given app
+  var listAllInactiveRevisionsCmd = getListRevisionsCommand(context, {
+    format: "\"value(name)\"",
+    filter: "'(status.conditions.status=False OR status.conditions.status=Unknown)'"
+  });
+  // this removes the newest `revisionsToKeep` images
+  var listRevisionsToDeleteCmd = (0, removeFirstLinesFromCommandOutput_1.removeFirstLinesFromCommandOutput)(listAllInactiveRevisionsCmd, keep);
+  var deleteRevisionCmd = "gcloud run revisions delete ".concat((0, createArgsString_1.createArgsString)({
+    project: deployConfig.projectId,
+    region: deployConfig.region,
+    quiet: true
+  }), " $revisionname ");
+  var deleteRevisionsCmd = "".concat(listRevisionsToDeleteCmd, " | while read -r revisionname; do ").concat(deleteRevisionCmd, "; done");
+  return [deleteRevisionsCmd];
+};
+exports.getDeleteUnusedRevisionsCommands = getDeleteUnusedRevisionsCommands;
+
+/***/ }),
+
 /***/ 2256:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
@@ -42434,9 +42770,20 @@ var createArgsString_1 = __nccwpck_require__(8686);
 var database_1 = __nccwpck_require__(1384);
 var gcloudServiceAccountLoginCommands_1 = __nccwpck_require__(2607);
 var jobName_1 = __nccwpck_require__(7311);
-var setExtraVarsScripts = function (deployConfig) {
+var artifactsRegistry_1 = __nccwpck_require__(8159);
+var getServiceName_1 = __nccwpck_require__(9391);
+var cleanup_1 = __nccwpck_require__(964);
+var setGoogleProjectNumberScript = function (deployConfig) {
   return ["export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe ".concat(deployConfig.projectId, " --format=\"value(projectNumber)\")"), "echo \"GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER\""];
 };
+var makeLabelString = function (obj) {
+  return Object.entries(obj).map(function (_a) {
+    var _b = __read(_a, 2),
+      key = _b[0],
+      value = _b[1];
+    return "".concat(key, "=").concat(value);
+  }).join(",");
+};
 var createGoogleCloudRunDeployJobs = function (context) {
   var _a, _b, _c;
   var deployConfig = context.componentConfig.deploy;
@@ -42447,28 +42794,17 @@ var createGoogleCloudRunDeployJobs = function (context) {
     // should not happen
     throw new Error("deploy config is wrong");
   }
-  var fullAppName = "".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName);
-  var dockerUrl = "".concat(deployConfig.region, "-docker.pkg.dev/").concat(deployConfig.projectId, "/catladder-deploy/").concat(fullAppName);
-  var gcloudImageName = "".concat(dockerUrl, "/").concat(context.environment.shortName, "/").concat(context.componentName, ":$DOCKER_IMAGE_TAG");
-  var pushImageToArtifactsRegistry = [docker_1.gitlabDockerLogin, "gcloud auth configure-docker ".concat(deployConfig.region, "-docker.pkg.dev"), "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG", "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG ".concat(gcloudImageName), "docker push ".concat(gcloudImageName)];
   var allEnvVars = (0, lodash_1.omit)(context.environment.envVars, _1.GCLOUD_DEPLOY_CREDENTIALS_KEY);
-  var labelsString = Object.entries((0, getLabels_1.getLabels)(context)).map(function (_a) {
-    var _b = __read(_a, 2),
-      key = _b[0],
-      value = _b[1];
-    return "".concat(key, "=").concat(value);
-  }).join(",");
   var commonArgs = {
     project: deployConfig.projectId,
     region: deployConfig.region
   };
   var commonDeployArgs = __assign(__assign({
-    image: gcloudImageName
+    image: (0, artifactsRegistry_1.getArtifactsRegistryImage)(context)
   }, commonArgs), {
-    "set-cloudsql-instances": deployConfig.cloudSql ? deployConfig.cloudSql.instanceConnectionName : undefined,
-    labels: labelsString
+    "set-cloudsql-instances": deployConfig.cloudSql ? deployConfig.cloudSql.instanceConnectionName : undefined
   });
-  var serviceName = context.environment.fullName.toLowerCase();
+  var serviceName = (0, getServiceName_1.getServiceName)(context);
   var getFullJobName = function (name) {
     return (0, jobName_1.getCloudRunJobName)(context.environment.fullName, name);
   };
@@ -42497,30 +42833,41 @@ var createGoogleCloudRunDeployJobs = function (context) {
     };
   });
   var getServiceDeployScript = function (service, nameSuffix) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     var customConfig = service !== true ? service : undefined;
     var command = service !== true ? (_a = service === null || service === void 0 ? void 0 : service.command) !== null && _a !== void 0 ? _a : context.componentConfig.build.startCommand : undefined;
+    var commandArray = command ? Array.isArray(command) ? command : command.split(" ") : undefined;
+    var fullServiceName = "".concat(serviceName).concat(nameSuffix !== null && nameSuffix !== void 0 ? nameSuffix : "");
     var argsString = (0, createArgsString_1.createArgsString)(__assign(__assign({
       // command as empty string resets it to default (uses the image's entrypoint)
-      command: command ? '"' + command.split(" ").join(",") + '"' : '""'
+      command: commandArray ? '"' + commandArray.join(",") + '"' : '""'
     }, commonDeployArgs), {
+      labels: makeLabelString(__assign(__assign({}, (0, getLabels_1.getLabels)(context)), {
+        "cloud-run-service-name": fullServiceName
+      })),
       "env-vars-file": "____envvars.yaml",
       "min-instances": (_b = customConfig === null || customConfig === void 0 ? void 0 : customConfig.minInstances) !== null && _b !== void 0 ? _b : 0,
       "max-instances": (_c = customConfig === null || customConfig === void 0 ? void 0 : customConfig.maxInstances) !== null && _c !== void 0 ? _c : 100,
       "cpu-throttling": (customConfig === null || customConfig === void 0 ? void 0 : customConfig.noCpuThrottling) !== true,
       memory: customConfig === null || customConfig === void 0 ? void 0 : customConfig.memory,
       "allow-unauthenticated": (_d = customConfig === null || customConfig === void 0 ? void 0 : customConfig.allowUnauthenticated) !== null && _d !== void 0 ? _d : true,
+      ingress: (_e = customConfig === null || customConfig === void 0 ? void 0 : customConfig.ingress) !== null && _e !== void 0 ? _e : "all",
       "cpu-boost": true
     }));
-    return "gcloud run deploy ".concat(serviceName).concat(nameSuffix !== null && nameSuffix !== void 0 ? nameSuffix : "", " ").concat(argsString);
+    return "gcloud run deploy ".concat(fullServiceName, " ").concat(argsString);
   };
   var getJobCreateScriptsForJob = function (jobName, job) {
     // due to some oversight from google, jobs create does not accept `--env-vars-file` 🤦
     // lucky, update on the other hand accepts it... so let's just imediatly update it
     // also we cannot upsert a job, so we have to create it and catch the error and then update
+    var commandArray = Array.isArray(job.command) ? job.command : job.command.split(" ");
     var commonDeployArgsString = (0, createArgsString_1.createArgsString)(__assign(__assign({
-      command: '"' + job.command.split(" ").join(",") + '"'
+      command: '"' + commandArray.join(",") + '"'
     }, commonDeployArgs), {
+      labels: makeLabelString(__assign(__assign({}, (0, getLabels_1.getLabels)(context)), {
+        "cloud-run-job-name": jobName
+      })),
+      image: job.image || commonDeployArgs.image,
       memory: job.memory || "512Mi",
       "task-timeout": job.timeout || "10m"
     }));
@@ -42535,8 +42882,8 @@ var createGoogleCloudRunDeployJobs = function (context) {
       return getJobCreateScriptsForJob(jobName, job);
     }).flat();
   };
-  var getJobRunScriptForJob = function (jobName) {
-    return "gcloud beta run jobs execute ".concat(jobName, " ").concat(commonArgsString);
+  var getJobRunScriptForJob = function (jobName, wait) {
+    return "gcloud beta run jobs execute ".concat(jobName, " ").concat(commonArgsString).concat(wait ? " --wait" : "");
   };
   var getJobRunScripts = function (when) {
     return jobsWithNames.filter(function (_a) {
@@ -42544,7 +42891,9 @@ var createGoogleCloudRunDeployJobs = function (context) {
       return job.when === when;
     }).map(function (_a) {
       var jobName = _a.jobName;
-      return getJobRunScriptForJob(jobName);
+      return getJobRunScriptForJob(jobName,
+      // wait for completin on stop jobs, since stop will delete the jobs afterwards, so they will fail
+      ["preStop", "postStop"].includes(when));
     });
   };
   var getCreateScheduleScripts = function () {
@@ -42584,18 +42933,19 @@ var createGoogleCloudRunDeployJobs = function (context) {
       "gcloud beta run jobs executions list ".concat(commonArgsString, " --job ").concat(jobName, " --format=\"value(name)\" | xargs -I {} gcloud beta run jobs executions delete {}  --quiet ").concat(commonArgsString), "gcloud beta run jobs delete ".concat(jobName, " ").concat(commonArgsString)];
     });
   };
-  var deployScripts = __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read(setExtraVarsScripts(deployConfig)), false), __read(pushImageToArtifactsRegistry), false), ["echo \"$ENV_VARS\" > ____envvars.yaml"], false), __read(deployConfig.cloudSql ? (0, database_1.getDatabaseCreateScript)(context, deployConfig) // we create the db, so that we can also delete it afterwards
+  var deployScripts = __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gitlab_1.collapseableSection)("prepare", "Prepare...")(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read(setGoogleProjectNumberScript(deployConfig)), false))), false), __read((0, gitlab_1.collapseableSection)("deploy", "Deploy to cloud run")(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(["echo \"$ENV_VARS\" > ____envvars.yaml"], __read(deployConfig.cloudSql ? (0, database_1.getDatabaseCreateScript)(context, deployConfig) // we create the db, so that we can also delete it afterwards
   : []), false), __read(getCreateScheduleScripts()), false), __read(getJobCreateScripts()), false), __read(getJobRunScripts("preDeploy")), false), __read(deployConfig.service !== false ? [getServiceDeployScript(deployConfig.service)] : []), false), __read(Object.entries((_b = deployConfig.additionalServices) !== null && _b !== void 0 ? _b : {}).map(function (_a) {
     var _b = __read(_a, 2),
       name = _b[0],
       service = _b[1];
     return getServiceDeployScript(service, "-" + name);
-  })), false), __read(getJobRunScripts("postDeploy")), false), ["docker image rm ".concat(gcloudImageName)], false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false);
-  var stopScripts = __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read(deployConfig.service !== false ? ["gcloud run services delete ".concat(serviceName, " ").concat(commonArgsString)] : []), false), __read(Object.entries((_c = deployConfig.additionalServices) !== null && _c !== void 0 ? _c : {}).map(function (_a) {
+  })), false), __read(getJobRunScripts("postDeploy")), false))), false), __read((0, gitlab_1.collapseableSection)("cleanup", "Cleanup")((0, cleanup_1.getRemoveOldRevisionsAndImagesCommand)(context, "postDeploy") // we cleanup inactive images both on deploy and stop
+  )), false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false);
+  var stopScripts = __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read(getJobRunScripts("preStop")), false), __read(deployConfig.service !== false ? ["gcloud run services delete ".concat(serviceName, " ").concat(commonArgsString)] : []), false), __read(Object.entries((_c = deployConfig.additionalServices) !== null && _c !== void 0 ? _c : {}).map(function (_a) {
     var _b = __read(_a, 1),
       name = _b[0];
     return "gcloud run services delete ".concat(serviceName, "-").concat(name, " ").concat(commonArgsString);
-  })), false), __read(getDeleteSchedulesScripts()), false), __read(getDeleteJobsScripts()), false), __read(deployConfig.cloudSql && deployConfig.cloudSql.deleteDatabaseOnStop ? (0, database_1.getDatabaseDeleteScript)(context, deployConfig) : []), false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false);
+  })), false), __read(getJobRunScripts("postStop")), false), __read(getDeleteSchedulesScripts()), false), __read(getDeleteJobsScripts()), false), __read(deployConfig.cloudSql && deployConfig.cloudSql.deleteDatabaseOnStop ? (0, database_1.getDatabaseDeleteScript)(context, deployConfig) : []), false), __read((0, cleanup_1.getRemoveOldRevisionsAndImagesCommand)(context, "onStop")), false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false);
   return (0, base_1.createDeployementJobs)(context, {
     deploy: (0, lodash_1.merge)((0, docker_1.getDockerJobBaseProps)(context), {
       artifacts: {
@@ -42680,6 +43030,7 @@ var utils_1 = __nccwpck_require__(463);
 var deployJob_1 = __nccwpck_require__(2256);
 var jobName_1 = __nccwpck_require__(7311);
 exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = "GCLOUD_DEPLOY_credentialsKey";
+// FIXME: rename to internalHostSuffix, but this means that project-setup needs to be rerun, so its kindof a breaking change
 exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX = "GCLOUD_RUN_canonicalHostSuffix";
 var getCloudSqlVariables = function (_a) {
   var _b, _c;
@@ -42738,7 +43089,7 @@ exports.GCLOUD_RUN_DEPLOY_TYPE = {
       env = ctx.env,
       componentName = ctx.componentName,
       deployConfigRaw = ctx.deployConfigRaw;
-    var HOST_CANONICAL = fullName.toLowerCase() + "-" + ((_a = process.env[(0, context_1.getSecretVarName)(env, componentName, exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX)]) !== null && _a !== void 0 ? _a : "unknown-host.example.com");
+    var HOST_INTERNAL = fullName.toLowerCase() + "-" + ((_a = process.env[(0, context_1.getSecretVarName)(env, componentName, exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX)]) !== null && _a !== void 0 ? _a : "unknown-host.example.com");
     var jobTriggers = deployConfigRaw && deployConfigRaw.jobs ? Object.fromEntries(Object.entries(deployConfigRaw.jobs).map(function (_a) {
       var _b = __read(_a, 2),
         name = _b[0],
@@ -42746,7 +43097,7 @@ exports.GCLOUD_RUN_DEPLOY_TYPE = {
       return ["CLOUD_RUN_JOB_TRIGGER_URL_" + (0, gitlab_1.sanitizeForBashVariable)(name), "https://".concat(deployConfigRaw.region, "-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/").concat(deployConfigRaw.projectId, "/jobs/").concat((0, jobName_1.getCloudRunJobName)(fullName, name), ":run")];
     })) : {};
     return __assign(__assign({
-      HOST_CANONICAL: HOST_CANONICAL
+      HOST_INTERNAL: HOST_INTERNAL
     }, getCloudSqlVariables(ctx)), jobTriggers);
   }
 };
@@ -42897,12 +43248,27 @@ exports.gcloudServiceAccountLoginCommands = void 0;
 var __1 = __nccwpck_require__(1344);
 var context_1 = __nccwpck_require__(2041);
 var gcloudServiceAccountLoginCommands = function (context) {
-  return ["echo $".concat((0, context_1.getSecretVarNameForContext)(context, __1.GCLOUD_DEPLOY_CREDENTIALS_KEY), " > ./____keyfile.json\n          "), "gcloud auth activate-service-account --key-file=\"./____keyfile.json\""];
+  return ["gcloud auth activate-service-account --key-file=<(echo \"$".concat((0, context_1.getSecretVarNameForContext)(context, __1.GCLOUD_DEPLOY_CREDENTIALS_KEY), "\")")];
 };
 exports.gcloudServiceAccountLoginCommands = gcloudServiceAccountLoginCommands;
 
 /***/ }),
 
+/***/ 9391:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+
+exports.__esModule = true;
+exports.getServiceName = void 0;
+var getServiceName = function (context) {
+  return context.environment.fullName.toLowerCase();
+};
+exports.getServiceName = getServiceName;
+
+/***/ }),
+
 /***/ 7311:
 /***/ ((__unused_webpack_module, exports) => {
 
@@ -42918,6 +43284,29 @@ exports.getCloudRunJobName = getCloudRunJobName;
 
 /***/ }),
 
+/***/ 7547:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+
+exports.__esModule = true;
+exports.removeFirstLinesFromCommandOutput = void 0;
+/**
+ *
+ * takes a command and removes the first keep lines from the output
+ *
+ * @param cmd the command, its stdout is then limited
+ * @param removeFirstN how many lines to remove at the start of the command
+ * @returns
+ */
+var removeFirstLinesFromCommandOutput = function (cmd, removeFirstN) {
+  return removeFirstN === 0 ? cmd : "".concat(cmd, " | tail -n +").concat(removeFirstN + 1);
+};
+exports.removeFirstLinesFromCommandOutput = removeFirstLinesFromCommandOutput;
+
+/***/ }),
+
 /***/ 463:
 /***/ ((__unused_webpack_module, exports) => {
 
@@ -43050,6 +43439,37 @@ var __assign = this && this.__assign || function () {
   };
   return __assign.apply(this, arguments);
 };
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+    r,
+    ar = [],
+    e;
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+  return ar;
+};
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
 exports.__esModule = true;
 exports.createDockerTagDeployJobs = void 0;
 var docker_1 = __nccwpck_require__(3219);
@@ -43067,7 +43487,7 @@ var createDockerTagDeployJobs = function (context) {
   var tag = deployConfig.tag;
   return (0, base_1.createDeployementJobs)(context, {
     deploy: __assign(__assign({}, (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, "\"")]
+      script: __spreadArray(__spreadArray([], __read((0, docker_1.gitlabDockerLogin)(context)), false), ["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, "\"")], false)
     })
   });
 };
@@ -43389,12 +43809,12 @@ exports.KUBERNETES_DEPLOY_TYPE = {
     var domainCanonical = deployConfigRaw && ((_b = deployConfigRaw.cluster) === null || _b === void 0 ? void 0 : _b.domainCanonical) ||
     // for convenience, we allow clusters to define a canonical domain, because a cluster has a fixed ip and you will usually have a domain pointing to that cluster
     fullConfig.domainCanonical || "panter.cloud";
-    var HOST_CANONICAL = "".concat(componentSlug, ".").concat(envInUrl, ".").concat(fullConfig.appName, ".").concat(fullConfig.customerName, ".").concat(domainCanonical); // default for kubernetes and rest
+    var HOST_INTERNAL = "".concat(componentSlug, ".").concat(envInUrl, ".").concat(fullConfig.appName, ".").concat(fullConfig.customerName, ".").concat(domainCanonical); // default for kubernetes and rest
     return {
       KUBE_NAMESPACE: KUBE_NAMESPACE,
       KUBE_APP_NAME: KUBE_APP_NAME,
       KUBE_APP_NAME_PREFIX: KUBE_APP_NAME_PREFIX,
-      HOST_CANONICAL: HOST_CANONICAL
+      HOST_INTERNAL: HOST_INTERNAL
     };
   }
 };
@@ -44600,7 +45020,8 @@ var createChildPipeline = function (type, trigger, config) {
           _a = {
             image: (0, runner_1.getRunnerImage)("jobs-default"),
             variables: {
-              FF_USE_FASTZIP: "true"
+              FF_USE_FASTZIP: "true",
+              GIT_DEPTH: 1
             },
             workflow: {
               rules: rules_1.RULES_ALWAYS
@@ -45318,7 +45739,7 @@ var path_equal_1 = __nccwpck_require__(4843);
 var yarnUtils_1 = __nccwpck_require__(1369);
 var getPackageManagerInfo = function (config, componentName) {
   return __awaiter(void 0, void 0, void 0, function () {
-    var version, isClassic, component, workspaces, currentWorkspace, componentIsInWorkspace, workspaceRoot, packageJson, workspacePackageJson, lockFile, configFiles, configFilePaths, workspaceDependencies, pathsToCopyInDocker;
+    var version, isClassic, component, workspaces, currentWorkspace, componentIsInWorkspace, workspaceRoot, packageJson, workspacePackageJson, lockFile, configFiles, configFilePaths, currentWorkspaceDependencies, pathsToCopyInDocker;
     return __generator(this, function (_a) {
       switch (_a.label) {
         case 0:
@@ -45345,19 +45766,15 @@ var getPackageManagerInfo = function (config, componentName) {
           })), false).filter(function (f) {
             return (0, fs_1.existsSync)(f);
           });
-          workspaceDependencies = currentWorkspace ? __spreadArray(__spreadArray([], __read(currentWorkspace.workspaceDependencies), false), __read(currentWorkspace.mismatchedWorkspaceDependencies), false).map(function (name) {
-            var _a;
-            return (_a = workspaces.find(function (w) {
-              return w.name === name;
-            })) === null || _a === void 0 ? void 0 : _a.location;
-          }).filter(Boolean) : [];
-          pathsToCopyInDocker = __spreadArray(__spreadArray(__spreadArray(__spreadArray([packageJson], __read(workspacePackageJson ? [workspacePackageJson] : []), false), [lockFile], false), __read(configFilePaths), false), __read(workspaceDependencies), false);
+          currentWorkspaceDependencies = currentWorkspace ? (0, yarnUtils_1.getWorkspaceDependencies)(currentWorkspace, workspaces) : [];
+          pathsToCopyInDocker = __spreadArray(__spreadArray(__spreadArray(__spreadArray([packageJson], __read(workspacePackageJson ? [workspacePackageJson] : []), false), [lockFile], false), __read(configFilePaths), false), __read(currentWorkspaceDependencies), false);
           return [2 /*return*/, {
             type: "yarn",
             workspaces: workspaces,
             version: version,
             isClassic: isClassic,
             currentWorkspace: currentWorkspace,
+            currentWorkspaceDependencies: currentWorkspaceDependencies,
             componentIsInWorkspace: componentIsInWorkspace,
             pathsToCopyInDocker: pathsToCopyInDocker
           }];
@@ -45490,13 +45907,44 @@ var __generator = this && this.__generator || function (thisArg, body) {
     };
   }
 };
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+    r,
+    ar = [],
+    e;
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+  return ar;
+};
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
 var __importDefault = this && this.__importDefault || function (mod) {
   return mod && mod.__esModule ? mod : {
     "default": mod
   };
 };
 exports.__esModule = true;
-exports.getWorkspaces = exports.getYarnVersion = void 0;
+exports.getWorkspaceDependencies = exports.getWorkspaces = exports.getYarnVersion = void 0;
 var child_process_promise_1 = __nccwpck_require__(5763);
 var memoizee_1 = __importDefault(__nccwpck_require__(5839));
 var execOrFail = function (cmd, onFail) {
@@ -45566,6 +46014,20 @@ exports.getWorkspaces = (0, memoizee_1["default"])(function (isClassic) {
 }, {
   promise: true
 });
+// recursivly get all workspace dependencies
+var getWorkspaceDependencies = function (ws, allWorkspaces) {
+  return ws ? __spreadArray(__spreadArray([], __read(ws.workspaceDependencies), false), __read(ws.mismatchedWorkspaceDependencies), false).flatMap(function (location) {
+    // we have to do this recursivly
+    var otherWorkspace = allWorkspaces.find(function (w) {
+      return w.location === location;
+    });
+    if (otherWorkspace) {
+      return __spreadArray(__spreadArray([], __read((0, exports.getWorkspaceDependencies)(otherWorkspace, allWorkspaces)), false), [otherWorkspace.location], false);
+    }
+    return [];
+  }).filter(Boolean) : [];
+};
+exports.getWorkspaceDependencies = getWorkspaceDependencies;
 
 /***/ }),
 
@@ -45807,7 +46269,7 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   return to.concat(ar || Array.prototype.slice.call(from));
 };
 exports.__esModule = true;
-exports.repeatOnFailure = exports.sanitizeForBashVariable = exports.allowFailureInScripts = void 0;
+exports.collapseableSection = exports.repeatOnFailure = exports.sanitizeForBashVariable = exports.allowFailureInScripts = void 0;
 var allowFailureInScripts = function (script) {
   return __spreadArray(__spreadArray(["set +e"], __read(script), false), ["set -e" // reenable
   ], false);
@@ -45821,6 +46283,12 @@ var repeatOnFailure = function (command, options) {
   return "\n    until ".concat(command, "\n    do\n      echo \"Trying again.\"\n      sleep ").concat(options.pauseInSeconds, "\n    done\n  ");
 };
 exports.repeatOnFailure = repeatOnFailure;
+var collapseableSection = function (name, header) {
+  return function (commands) {
+    return __spreadArray(__spreadArray(["echo -e \"\\e[0Ksection_start:$(date +%s):".concat(name, "[collapsed=true]\\r\\e[0K").concat(header, "\"")], __read(commands), false), ["echo -e \"\\e[0Ksection_end:$(date +%s):".concat(name, "\\r\\e[0K\"")], false);
+  };
+};
+exports.collapseableSection = collapseableSection;
 
 /***/ }),