@catladder/cli 0.0.0-fix-meteor-2-e94ec0c0 → 0.0.0-fix-cloud-run-ar-only-415e668a

package/README.md

@@ -33,3 +33,9 @@ Catladder stores some preferences in `~/.catladder/preferences.yml` in case you
 ## Contribution
 
 Check the documentation [here](https://git.panter.ch/catladder/catladder/-/tree/main/cli/CONTRIBUTING.md).
+
+### Adding packages in cli
+
+if you add npm libs in cli, make sure to add them as dev-dependencies.
+
+the reason is that we bundle all dependencies in the cli package, so that if you add that to your project, it won't install all @catladder/cli's dependencies.

package/dist/apps/cli/commands/cloudSQL/commandRestoreDb.js

@@ -36,7 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 exports.__esModule = true;
-var child_process_promise_1 = require("child-process-promise");
+var copyDb_1 = require("../../../../gcloud/cloudSql/copyDb");
 var startProxy_1 = require("../../../../gcloud/cloudSql/startProxy");
 exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
     return __generator(this, function (_a) {
@@ -44,7 +44,7 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
                 .command("cloud-sql-restore-db", "restore a db from one source to another target")
                 .action(function restoreDb() {
                 return __awaiter(this, void 0, void 0, function () {
-                    var sourceInstance, sourceProxy, targetProxy, sourcePort, targetPort, sourceLocalPort, sourceUsername, sourcePassword, sourceDbName, targetInstance, targetLocalPort, targetUsername, targetPassword, targetDbName, shouldContinue, targetPSQL, copyDBScript;
+                    var sourceInstance, sourceProxy, targetProxy, sourcePort, targetPort, sourceLocalPort, sourceUsername, sourcePassword, sourceDbName, targetInstance, targetLocalPort, targetUsername, targetPassword, targetDbName, shouldContinue;
                     return __generator(this, function (_a) {
                         switch (_a.label) {
                             case 0: return [4 /*yield*/, this.prompt({
@@ -155,14 +155,19 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
                                 if (!shouldContinue) {
                                     return [2 /*return*/];
                                 }
-                                targetPSQL = function (command) {
-                                    return "PGPASSWORD=".concat(targetPassword, " psql -p ").concat(targetPort, " --host=localhost --user=").concat(targetUsername, " -q ").concat(command);
-                                };
-                                copyDBScript = "\n      set -e\n     \n    \n\n      dumptmp=$(mktemp /tmp/dump.XXXXXX)\n\n      echo \"Dumping file to $dumptmp\"\n      pg_dump --dbname=postgres://".concat(sourceUsername, ":").concat(sourcePassword, "@localhost:").concat(sourcePort, "/").concat(sourceDbName, " --no-owner --no-privileges > $dumptmp\n      echo \"dump done\"\n      ").concat(targetPSQL("-c 'drop database \"".concat(targetDbName, "\" WITH (FORCE)' 1> /dev/null || true")), "\n      ").concat(targetPSQL("-c 'create database \"".concat(targetDbName, "\"' 1> /dev/null")), "\n          echo \"Restoring dump...\"\n      ").concat(targetPSQL("\"".concat(targetDbName, "\" < $dumptmp 1> /dev/null")), "\n  \n\n      echo \"Clean up...\"\n      set +e\n      rm $dumptmp\n      echo \"\n\uD83D\uDC31 Done!\"\n      ");
                                 _a.label = 18;
                             case 18:
                                 _a.trys.push([18, , 20, 21]);
-                                return [4 /*yield*/, (0, child_process_promise_1.spawn)(copyDBScript, [], { shell: "bash", stdio: "inherit" })];
+                                return [4 /*yield*/, (0, copyDb_1.spawnCopyDb)({
+                                        targetPassword: targetPassword,
+                                        targetPort: targetPort,
+                                        targetUsername: targetUsername,
+                                        sourceUsername: sourceUsername,
+                                        sourcePassword: sourcePassword,
+                                        sourcePort: sourcePort,
+                                        sourceDbName: sourceDbName,
+                                        targetDbName: targetDbName
+                                    })];
                             case 19:
                                 _a.sent();
                                 return [3 /*break*/, 21];

package/dist/apps/cli/commands/cloudSQL/commandRestoreDb.js.map

@@ -1 +1 @@
-{"version":3,"file":"commandRestoreDb.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/cloudSQL/commandRestoreDb.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"commandRestoreDb.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/cloudSQL/commandRestoreDb.ts"],"names":[],"mappings":"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"}

package/dist/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.d.ts

@@ -0,0 +1,3 @@
+import type Vorpal from "vorpal";
+declare const _default: (vorpal: Vorpal) => Promise<Vorpal.Command>;
+export default _default;

package/dist/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.js

@@ -0,0 +1,189 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+exports.__esModule = true;
+var getProjectConfig_1 = require("../../../../../config/getProjectConfig");
+var startProxy_1 = require("../../../../../gcloud/cloudSql/startProxy");
+var autocompletions_1 = require("../utils/autocompletions");
+var connection_string_parser_1 = require("connection-string-parser");
+var copyDb_1 = require("../../../../../gcloud/cloudSql/copyDb");
+exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
+    return __generator(this, function (_a) {
+        return [2 /*return*/, vorpal
+                .command("project-cloud-sql-restore-db", "restores a project db from one source to another target")
+                .action(function restoreDb() {
+                var _a, _b, _c, _d;
+                return __awaiter(this, void 0, void 0, function () {
+                    var envs, sourceEnvAndComponent, _e, sourceEnv, sourceComponent, sourceContext, sourceEnvVars, sourceProxy, sourceDbName, sourceUsername, sourcePassword, targetUsername, targetPassword, targetProxy, sourcePort, targetPort, targetDbName, closeAll, parser, parsersResult, targetEnvAndComponent, _f, targetEnv, targetComponent, targetContext, targetEnvVars, parser, parsersResult, shouldContinue, confirmInstance;
+                    return __generator(this, function (_g) {
+                        switch (_g.label) {
+                            case 0: return [4 /*yield*/, (0, autocompletions_1.envAndComponents)()];
+                            case 1:
+                                envs = _g.sent();
+                                return [4 /*yield*/, this.prompt({
+                                        type: "list",
+                                        name: "sourceEnvAndComponent",
+                                        choices: envs,
+                                        message: "Source instance (connection string or 'local')? 🤔 "
+                                    })];
+                            case 2:
+                                sourceEnvAndComponent = (_g.sent()).sourceEnvAndComponent;
+                                _e = sourceEnvAndComponent.split(":"), sourceEnv = _e[0], sourceComponent = _e[1];
+                                return [4 /*yield*/, (0, getProjectConfig_1.getPipelineContextByChoice)(sourceEnv, sourceComponent)];
+                            case 3:
+                                sourceContext = _g.sent();
+                                return [4 /*yield*/, (0, getProjectConfig_1.getEnvVarsResolved)(this, sourceContext.environment.shortName, sourceContext.componentName)];
+                            case 4:
+                                sourceEnvVars = _g.sent();
+                                closeAll = function () {
+                                    sourceProxy === null || sourceProxy === void 0 ? void 0 : sourceProxy.stop();
+                                    targetProxy === null || targetProxy === void 0 ? void 0 : targetProxy.stop();
+                                };
+                                if (!(sourceEnv === "local")) return [3 /*break*/, 5];
+                                parser = new connection_string_parser_1.ConnectionStringParser({
+                                    scheme: "postgres",
+                                    hosts: []
+                                });
+                                parsersResult = parser.parse(sourceEnvVars.DATABASE_URL);
+                                sourcePort = (_b = (_a = parsersResult.hosts) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.port;
+                                sourceUsername = parsersResult.username;
+                                sourcePassword = parsersResult.password;
+                                sourceDbName = parsersResult.endpoint;
+                                return [3 /*break*/, 7];
+                            case 5:
+                                sourcePort = 54399;
+                                return [4 /*yield*/, (0, startProxy_1.startCloudSqlProxyInBackground)({
+                                        instanceName: sourceEnvVars.CLOUD_SQL_INSTANCE_CONNECTION_NAME,
+                                        localPort: sourcePort
+                                    })];
+                            case 6:
+                                sourceProxy = _g.sent();
+                                sourceUsername = sourceEnvVars.DB_USER;
+                                sourcePassword = sourceEnvVars.DB_PASSWORD;
+                                sourceDbName = sourceEnvVars.DB_NAME;
+                                _g.label = 7;
+                            case 7: return [4 /*yield*/, this.prompt({
+                                    type: "list",
+                                    name: "targetEnvAndComponent",
+                                    choices: envs,
+                                    message: "target env? 🤔 "
+                                })];
+                            case 8:
+                                targetEnvAndComponent = (_g.sent()).targetEnvAndComponent;
+                                _f = targetEnvAndComponent.split(":"), targetEnv = _f[0], targetComponent = _f[1];
+                                return [4 /*yield*/, (0, getProjectConfig_1.getPipelineContextByChoice)(targetEnv, targetComponent)];
+                            case 9:
+                                targetContext = _g.sent();
+                                return [4 /*yield*/, (0, getProjectConfig_1.getEnvVarsResolved)(this, targetContext.environment.shortName, targetContext.componentName)];
+                            case 10:
+                                targetEnvVars = _g.sent();
+                                if (!(targetEnv === "local")) return [3 /*break*/, 11];
+                                parser = new connection_string_parser_1.ConnectionStringParser({
+                                    scheme: "postgres",
+                                    hosts: []
+                                });
+                                parsersResult = parser.parse(targetEnvVars.DATABASE_URL);
+                                targetPort = (_d = (_c = parsersResult.hosts) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.port;
+                                targetUsername = parsersResult.username;
+                                targetPassword = parsersResult.password;
+                                targetDbName = parsersResult.endpoint;
+                                return [3 /*break*/, 13];
+                            case 11:
+                                targetPort = 54499;
+                                return [4 /*yield*/, (0, startProxy_1.startCloudSqlProxyInBackground)({
+                                        instanceName: targetEnvVars.CLOUD_SQL_INSTANCE_CONNECTION_NAME,
+                                        localPort: targetPort
+                                    })];
+                            case 12:
+                                targetProxy = _g.sent();
+                                targetUsername = targetEnvVars.DB_USER;
+                                targetPassword = targetEnvVars.DB_PASSWORD;
+                                targetDbName = sourceEnvVars.DB_NAME;
+                                _g.label = 13;
+                            case 13: return [4 /*yield*/, this.prompt({
+                                    type: "confirm",
+                                    name: "shouldContinue",
+                                    message: "This will drop ".concat(targetEnv, "/").concat(targetDbName, " and replace it with ").concat(sourceEnv, "/").concat(sourceDbName, ". Continue? \uD83E\uDD14 ")
+                                })];
+                            case 14:
+                                shouldContinue = (_g.sent()).shouldContinue;
+                                if (!shouldContinue) {
+                                    this.log("abort");
+                                    closeAll();
+                                    return [2 /*return*/];
+                                }
+                                if (!(targetContext.environment.envType === "prod")) return [3 /*break*/, 16];
+                                this.log("\n\uD83D\uDEA8 You are overriding a production environment. Please type in ".concat(targetEnvVars.CLOUD_SQL_INSTANCE_CONNECTION_NAME, " to continue\n\n"));
+                                return [4 /*yield*/, this.prompt({
+                                        type: "input",
+                                        name: "confirmInstance",
+                                        message: "confirm: "
+                                    })];
+                            case 15:
+                                confirmInstance = (_g.sent()).confirmInstance;
+                                if (confirmInstance !== targetEnvVars.CLOUD_SQL_INSTANCE_CONNECTION_NAME) {
+                                    this.log("abort");
+                                    closeAll();
+                                    return [2 /*return*/];
+                                }
+                                _g.label = 16;
+                            case 16:
+                                _g.trys.push([16, , 18, 19]);
+                                return [4 /*yield*/, (0, copyDb_1.spawnCopyDb)({
+                                        targetPassword: targetPassword,
+                                        targetPort: targetPort,
+                                        targetUsername: targetUsername,
+                                        sourceUsername: sourceUsername,
+                                        sourcePassword: sourcePassword,
+                                        sourcePort: sourcePort,
+                                        sourceDbName: sourceDbName,
+                                        targetDbName: targetDbName
+                                    })];
+                            case 17:
+                                _g.sent();
+                                return [3 /*break*/, 19];
+                            case 18:
+                                closeAll();
+                                return [7 /*endfinally*/];
+                            case 19: return [2 /*return*/];
+                        }
+                    });
+                });
+            })];
+    });
+}); });
+//# sourceMappingURL=commandProjectRestoreDb.js.map

package/dist/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"commandProjectRestoreDb.js","sourceRoot":"","sources":["../../../../../../src/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.ts"],"names":[],"mappings":"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"}

package/dist/apps/cli/commands/project/index.js

@@ -63,6 +63,7 @@ var commandPortForward_1 = __importDefault(require("./commandPortForward"));
 var commandTriggerCronjob_1 = __importDefault(require("./commandTriggerCronjob"));
 var commandOpenGrafanaPod_1 = __importDefault(require("./commandOpenGrafanaPod"));
 var commandSecretsClearBackups_1 = __importDefault(require("./commandSecretsClearBackups"));
+var commandProjectRestoreDb_1 = __importDefault(require("./cloudSql/commandProjectRestoreDb"));
 exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
     return __generator(this, function (_a) {
         (0, commandSetup_1["default"])(vorpal);
@@ -77,6 +78,7 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
         (0, commandOpenGrafana_1["default"])(vorpal);
         (0, commandOpenGrafanaPod_1["default"])(vorpal);
         (0, commandCloudSqlProxy_1["default"])(vorpal);
+        (0, commandProjectRestoreDb_1["default"])(vorpal);
         (0, commandOpenGit_1["default"])(vorpal);
         (0, commandOpenEnv_1["default"])(vorpal);
         (0, commandTriggerCronjob_1["default"])(vorpal);

package/dist/apps/cli/commands/project/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gFAA0D;AAC1D,gFAA0D;AAE1D,0EAAoD;AACpD,gFAA0D;AAC1D,oEAA8C;AAC9C,0FAAoE;AACpE,sEAAgD;AAChD,sEAAgD;AAChD,gEAA0C;AAC1C,4DAA4D;AAC5D,sEAAgD;AAChD,8EAAwD;AACxD,wEAAkD;AAClD,wFAAkE;AAClE,gFAA0D;AAC1D,oEAA8C;AAC9C,oEAA8C;AAC9C,sEAAgD;AAChD,8EAAwD;AACxD,4EAAsD;AACtD,4EAAsD;AACtD,kFAA4D;AAE5D,kFAA4D;AAC5D,4FAAsE;AAEtE,sBAAe,UAAO,MAAc;;QAClC,IAAA,yBAAY,EAAC,MAAM,CAAC,CAAC;QAErB,IAAA,2BAAc,EAAC,MAAM,CAAC,CAAC;QAEvB,IAAA,6BAAgB,EAAC,MAAM,CAAC,CAAC;QACzB,IAAA,4BAAe,EAAC,MAAM,CAAC,CAAC;QACxB,IAAA,gCAAmB,EAAC,MAAM,CAAC,CAAC;QAC5B,IAAA,iCAAoB,EAAC,MAAM,CAAC,CAAC;QAE7B,IAAA,iCAAoB,EAAC,MAAM,CAAC,CAAC;QAE7B,IAAA,4BAAe,EAAC,MAAM,CAAC,CAAC;QAExB,IAAA,qCAAwB,EAAC,MAAM,CAAC,CAAC;QAEjC,IAAA,+BAAkB,EAAC,MAAM,CAAC,CAAC;QAC3B,IAAA,kCAAqB,EAAC,MAAM,CAAC,CAAC;QAC9B,IAAA,iCAAoB,EAAC,MAAM,CAAC,CAAC;QAC7B,IAAA,2BAAc,EAAC,MAAM,CAAC,CAAC;QACvB,IAAA,2BAAc,EAAC,MAAM,CAAC,CAAC;QACvB,IAAA,kCAAqB,EAAC,MAAM,CAAC,CAAC;QAC9B,IAAA,iCAAoB,EAAC,MAAM,CAAC,CAAC;QAC7B,IAAA,uCAA0B,EAAC,MAAM,CAAC,CAAC;QACnC,IAAA,8BAAiB,EAAC,MAAM,CAAC,CAAC;QAE1B,IAAA,4BAAe,EAAC,MAAM,CAAC,CAAC;QACxB,IAAA,+BAAkB,EAAC,MAAM,CAAC,CAAC;QAE3B,IAAA,4BAAe,EAAC,MAAM,CAAC,CAAC;QAExB,IAAA,sCAAyB,EAAC,MAAM,CAAC,CAAC;QAClC,IAAA,gCAAmB,EAAC,MAAM,CAAC,CAAC;;;KAC7B,EAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gFAA0D;AAC1D,gFAA0D;AAE1D,0EAAoD;AACpD,gFAA0D;AAC1D,oEAA8C;AAC9C,0FAAoE;AACpE,sEAAgD;AAChD,sEAAgD;AAChD,gEAA0C;AAC1C,4DAA4D;AAC5D,sEAAgD;AAChD,8EAAwD;AACxD,wEAAkD;AAClD,wFAAkE;AAClE,gFAA0D;AAC1D,oEAA8C;AAC9C,oEAA8C;AAC9C,sEAAgD;AAChD,8EAAwD;AACxD,4EAAsD;AACtD,4EAAsD;AACtD,kFAA4D;AAE5D,kFAA4D;AAC5D,4FAAsE;AACtE,+FAAyE;AAEzE,sBAAe,UAAO,MAAc;;QAClC,IAAA,yBAAY,EAAC,MAAM,CAAC,CAAC;QAErB,IAAA,2BAAc,EAAC,MAAM,CAAC,CAAC;QAEvB,IAAA,6BAAgB,EAAC,MAAM,CAAC,CAAC;QACzB,IAAA,4BAAe,EAAC,MAAM,CAAC,CAAC;QACxB,IAAA,gCAAmB,EAAC,MAAM,CAAC,CAAC;QAC5B,IAAA,iCAAoB,EAAC,MAAM,CAAC,CAAC;QAE7B,IAAA,iCAAoB,EAAC,MAAM,CAAC,CAAC;QAE7B,IAAA,4BAAe,EAAC,MAAM,CAAC,CAAC;QAExB,IAAA,qCAAwB,EAAC,MAAM,CAAC,CAAC;QAEjC,IAAA,+BAAkB,EAAC,MAAM,CAAC,CAAC;QAC3B,IAAA,kCAAqB,EAAC,MAAM,CAAC,CAAC;QAC9B,IAAA,iCAAoB,EAAC,MAAM,CAAC,CAAC;QAC7B,IAAA,oCAAuB,EAAC,MAAM,CAAC,CAAC;QAChC,IAAA,2BAAc,EAAC,MAAM,CAAC,CAAC;QACvB,IAAA,2BAAc,EAAC,MAAM,CAAC,CAAC;QACvB,IAAA,kCAAqB,EAAC,MAAM,CAAC,CAAC;QAC9B,IAAA,iCAAoB,EAAC,MAAM,CAAC,CAAC;QAC7B,IAAA,uCAA0B,EAAC,MAAM,CAAC,CAAC;QACnC,IAAA,8BAAiB,EAAC,MAAM,CAAC,CAAC;QAE1B,IAAA,4BAAe,EAAC,MAAM,CAAC,CAAC;QACxB,IAAA,+BAAkB,EAAC,MAAM,CAAC,CAAC;QAE3B,IAAA,4BAAe,EAAC,MAAM,CAAC,CAAC;QAExB,IAAA,sCAAyB,EAAC,MAAM,CAAC,CAAC;QAClC,IAAA,gCAAmB,EAAC,MAAM,CAAC,CAAC;;;KAC7B,EAAC"}

package/dist/bundles/catenv/index.js

@@ -39512,7 +39512,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: {}
     }
   });
@@ -39697,6 +39697,37 @@ 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
@@ -39709,6 +39740,8 @@ 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 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",
@@ -39716,14 +39749,18 @@ var DOCKER_RUNNER_BUILD_VARIABLES = {
   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_REGISTRY_IMAGE_PATH: (0, artifactsRegistry_1.getArtifactsRegistryImageName)(context)
+  } : {
     DOCKER_REGISTRY: "$CI_REGISTRY",
-    DOCKER_REGISTRY_IMAGE_PATH: "$CI_REGISTRY_IMAGE",
+    DOCKER_REGISTRY_IMAGE_PATH: "$CI_REGISTRY_IMAGE"
+  }), {
     DOCKER_CACHE_IMAGE: "$DOCKER_REGISTRY_IMAGE_PATH/caches/" + context.componentName,
     DOCKER_IMAGE_NAME: context.environment.shortName + "/" + context.componentName,
     DOCKER_IMAGE: "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
     DOCKER_IMAGE_TAG: "$CI_COMMIT_SHA"
-  };
+  });
 };
 exports.getDockerImageVariables = getDockerImageVariables;
 /**
@@ -39778,9 +39815,12 @@ 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([ensureDockerFileScript], __read((0, exports.gitlabDockerLogin)(context)), false), ["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"], false).filter(Boolean);
 };
 exports.getDockerBuildDefaultScript = getDockerBuildDefaultScript;
 var hasDockerfile = function (context) {
@@ -39959,7 +39999,7 @@ var createNodeBuildJobs = function (context) {
       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
@@ -40221,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" : ""
       }
@@ -40453,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);
@@ -40469,7 +40518,7 @@ var createRailsBuildJobs = function (context) {
     return (0, base_1.createBuildJobs)(context, {
       appBuild: undefined,
       dockerBuild: {
-        script: (0, docker_1.getDockerBuildDefaultScript)(),
+        script: (0, docker_1.getDockerBuildDefaultScript)(context),
         variables: {}
       }
     });
@@ -40486,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)
     }
   });
 };
@@ -40871,7 +40920,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "fix-meteor-2-e94ec0c0" || 0;
+exports.PIPELINE_IMAGE_TAG = "fix-cloud-run-ar-only-415e668a" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -42435,11 +42484,19 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   return to.concat(ar || Array.prototype.slice.call(from));
 };
 exports.__esModule = true;
-exports.getDeleteUnusedImagesCommands = exports.getPushToArtifactsRegistryCommands = exports.getArtifactsRegistryImage = exports.getArtifactsRegistryImageName = void 0;
-var docker_1 = __nccwpck_require__(3219);
+exports.getDeleteUnusedImagesCommands = exports.getArtifactsRegistryImage = exports.getArtifactsRegistryImageName = 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;
 /**
  *
  * 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
@@ -42458,7 +42515,7 @@ var getArtifactsRegistryImageName = function (context, lecacyReviewImageName) {
     throw new Error("lecacyReviewImageName is only allowed for review app");
   }
   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 dockerUrl = "".concat((0, exports.getArtifactsRegistryHost)(context), "/").concat(deployConfig.projectId, "/catladder-deploy/").concat(fullAppName);
   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("/");
 };
@@ -42467,19 +42524,6 @@ var getArtifactsRegistryImage = function (context) {
   return "".concat((0, exports.getArtifactsRegistryImageName)(context), ":$DOCKER_IMAGE_TAG");
 };
 exports.getArtifactsRegistryImage = getArtifactsRegistryImage;
-/**
- * commands to pull the image from the default registry and pushes it to google artifact registry. We might build and push directly to google artifact registry in the future
- */
-var getPushToArtifactsRegistryCommands = 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 fullImageName = (0, exports.getArtifactsRegistryImageName)(context);
-  return [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(fullImageName, ":$DOCKER_IMAGE_TAG"), "docker push ".concat(fullImageName, ":$DOCKER_IMAGE_TAG")];
-};
-exports.getPushToArtifactsRegistryCommands = getPushToArtifactsRegistryCommands;
 var getDeleteImageCommands = function (fullImageName, keepNewest) {
   if (keepNewest === void 0) {
     keepNewest = 0;
@@ -42860,7 +42904,7 @@ 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([], __read((0, gitlab_1.collapseableSection)("prepare", "Prepare...")(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read(setExtraVarsScripts(deployConfig)), false))), false), __read((0, gitlab_1.collapseableSection)("pushToArtifactRegistry", "Pushing image to artifacts registry")((0, artifactsRegistry_1.getPushToArtifactsRegistryCommands)(context))), 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
+  var deployScripts = __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gitlab_1.collapseableSection)("prepare", "Prepare...")(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read(setExtraVarsScripts(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],
@@ -43365,6 +43409,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);
@@ -43382,7 +43457,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)
     })
   });
 };
@@ -44915,7 +44990,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