@catladder/cli 0.0.0-main-d4af38d9 → 0.0.0-main-6b263a90

package/dist/apps/cli/commands/project/setup/setupCloudRun.d.ts

@@ -0,0 +1,3 @@
+import type { Context } from "@catladder/pipeline";
+import type { CommandInstance } from "vorpal";
+export declare const setupCloudRun: (instance: CommandInstance, context: Context) => Promise<void>;

package/dist/apps/cli/commands/project/setup/setupCloudRun.js

@@ -0,0 +1,92 @@
+"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;
+exports.setupCloudRun = void 0;
+var pipeline_1 = require("@catladder/pipeline");
+var artifactsRegistry_1 = require("../../../../../gcloud/artifactsRegistry");
+var getCloudRunDomainSuffix_1 = require("../../../../../gcloud/cloudRun/getCloudRunDomainSuffix");
+var enableServices_1 = require("../../../../../gcloud/enableServices");
+var serviceAccounts_1 = require("../../../../../gcloud/serviceAccounts");
+var gitlab_1 = require("../../../../../utils/gitlab");
+var setupCloudRun = function (instance, context) { return __awaiter(void 0, void 0, void 0, function () {
+    var config, suffix;
+    var _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0:
+                if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun")) {
+                    throw new Error("deploy config is not of type 'google-cloudrun'");
+                }
+                config = context.componentConfig.deploy;
+                // enable services
+                instance.log("enable required servies...");
+                return [4 /*yield*/, (0, enableServices_1.enableGCloudServices)(["run.googleapis.com", "artifactregistry.googleapis.com"], config)];
+            case 1:
+                _b.sent();
+                return [4 /*yield*/, (0, artifactsRegistry_1.upsertGcloudArtifactsRegistry)(config)];
+            case 2:
+                _b.sent();
+                return [4 /*yield*/, (0, serviceAccounts_1.upsertGcloudServiceAccountAndSaveSecret)(instance, context, {
+                        projectId: config.projectId,
+                        displayName: "Catladder gcloud deploy",
+                        description: "This service account deploys to google cloud",
+                        name: "cl-d",
+                        // TODO: run.admin is a bit much, would be better to follow https://stackoverflow.com/questions/55788714/deploying-to-cloud-run-with-a-custom-service-account-failed-with-iam-serviceacco
+                        roles: [
+                            "roles/artifactregistry.repoAdmin",
+                            "roles/run.admin",
+                            "roles/iam.serviceAccountUser",
+                        ]
+                    }, pipeline_1.GCLOUD_DEPLOY_CREDENTIALS_KEY)];
+            case 3:
+                _b.sent();
+                return [4 /*yield*/, (0, getCloudRunDomainSuffix_1.getCloudRunDomainSuffix)(config)];
+            case 4:
+                suffix = _b.sent();
+                instance.log("domain suffix: " + suffix);
+                return [4 /*yield*/, (0, gitlab_1.upsertAllVariables)(instance, (_a = {},
+                        _a[pipeline_1.GCLOUD_RUN_CANONICAL_HOST_SUFFIX] = suffix,
+                        _a), context.environment.shortName, context.componentName)];
+            case 5:
+                _b.sent();
+                return [2 /*return*/];
+        }
+    });
+}); };
+exports.setupCloudRun = setupCloudRun;
+//# sourceMappingURL=setupCloudRun.js.map

package/dist/apps/cli/commands/project/setup/setupCloudRun.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"setupCloudRun.js","sourceRoot":"","sources":["../../../../../../src/apps/cli/commands/project/setup/setupCloudRun.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAI6B;AAG7B,6EAAwF;AACxF,kGAAiG;AACjG,uEAA4E;AAC5E,yEAAgG;AAChG,sDAAiE;AAE1D,IAAM,aAAa,GAAG,UAC3B,QAAyB,EACzB,OAAgB;;;;;;gBAEhB,IAAI,CAAC,IAAA,yBAAc,EAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,iBAAiB,CAAC,EAAE;oBACtE,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;iBACnE;gBAEK,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC;gBAE9C,kBAAkB;gBAElB,QAAQ,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;gBAC3C,qBAAM,IAAA,qCAAoB,EACxB,CAAC,oBAAoB,EAAE,iCAAiC,CAAC,EACzD,MAAM,CACP,EAAA;;gBAHD,SAGC,CAAC;gBAEF,qBAAM,IAAA,iDAA6B,EAAC,MAAM,CAAC,EAAA;;gBAA3C,SAA2C,CAAC;gBAE5C,qBAAM,IAAA,yDAAuC,EAC3C,QAAQ,EACR,OAAO,EACP;wBACE,SAAS,EAAE,MAAM,CAAC,SAAS;wBAC3B,WAAW,EAAE,yBAAyB;wBACtC,WAAW,EAAE,8CAA8C;wBAC3D,IAAI,EAAE,MAAM;wBACZ,yLAAyL;wBACzL,KAAK,EAAE;4BACL,kCAAkC;4BAClC,iBAAiB;4BACjB,8BAA8B;yBAC/B;qBACF,EACD,wCAA6B,CAC9B,EAAA;;gBAhBD,SAgBC,CAAC;gBAOa,qBAAM,IAAA,iDAAuB,EAAC,MAAM,CAAC,EAAA;;gBAA9C,MAAM,GAAG,SAAqC;gBACpD,QAAQ,CAAC,GAAG,CAAC,iBAAiB,GAAG,MAAM,CAAC,CAAC;gBAEzC,qBAAM,IAAA,2BAAkB,EACtB,QAAQ;wBAEN,GAAC,2CAAgC,IAAG,MAAM;6BAE5C,OAAO,CAAC,WAAW,CAAC,SAAS,EAC7B,OAAO,CAAC,aAAa,CACtB,EAAA;;gBAPD,SAOC,CAAC;;;;KACH,CAAC;AAtDW,QAAA,aAAa,iBAsDxB"}

package/dist/apps/cli/commands/project/setup/setupContext.js

@@ -38,6 +38,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 exports.__esModule = true;
 exports.setupContext = void 0;
 var pipeline_1 = require("@catladder/pipeline");
+var setupCloudRun_1 = require("./setupCloudRun");
 var setupCloudSQL_1 = require("./setupCloudSQL");
 var setupKubernetes_1 = require("./setupKubernetes");
 var setupContext = function (instance, context) { return __awaiter(void 0, void 0, void 0, function () {
@@ -53,19 +54,25 @@ var setupContext = function (instance, context) { return __awaiter(void 0, void
                     context.componentName +
                     "...");
                 instance.log("");
-                if (!(0, pipeline_1.hasCloudSQL)(context)) return [3 /*break*/, 2];
-                return [4 /*yield*/, (0, setupCloudSQL_1.setupCloudSQL)(instance, context)];
+                if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun")) return [3 /*break*/, 2];
+                return [4 /*yield*/, (0, setupCloudRun_1.setupCloudRun)(instance, context)];
             case 1:
                 _a.sent();
                 _a.label = 2;
             case 2:
-                deployConfig = context.componentConfig.deploy;
-                if (!(0, pipeline_1.isOfDeployType)(deployConfig, "kubernetes")) return [3 /*break*/, 4];
-                return [4 /*yield*/, (0, setupKubernetes_1.setupKubernetes)(instance, context)];
+                if (!(0, pipeline_1.hasCloudSQL)(context)) return [3 /*break*/, 4];
+                return [4 /*yield*/, (0, setupCloudSQL_1.setupCloudSQL)(instance, context)];
             case 3:
                 _a.sent();
                 _a.label = 4;
             case 4:
+                deployConfig = context.componentConfig.deploy;
+                if (!(0, pipeline_1.isOfDeployType)(deployConfig, "kubernetes")) return [3 /*break*/, 6];
+                return [4 /*yield*/, (0, setupKubernetes_1.setupKubernetes)(instance, context)];
+            case 5:
+                _a.sent();
+                _a.label = 6;
+            case 6:
                 instance.log("");
                 instance.log("✅ " +
                     context.environment.shortName +

package/dist/apps/cli/commands/project/setup/setupContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"setupContext.js","sourceRoot":"","sources":["../../../../../../src/apps/cli/commands/project/setup/setupContext.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAAkE;AAElE,iDAAgD;AAEhD,qDAAoD;AAE7C,IAAM,YAAY,GAAG,UAC1B,QAAyB,EACzB,OAAgB;;;;;gBAEhB,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACjB,QAAQ,CAAC,GAAG,CACV,oFAAoF,CACrF,CAAC;gBAEF,QAAQ,CAAC,GAAG,CACV,mBAAmB;oBACjB,OAAO,CAAC,WAAW,CAAC,SAAS;oBAC7B,GAAG;oBACH,OAAO,CAAC,aAAa;oBACrB,KAAK,CACR,CAAC;gBACF,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;qBACb,IAAA,sBAAW,EAAC,OAAO,CAAC,EAApB,wBAAoB;gBACtB,qBAAM,IAAA,6BAAa,EAAC,QAAQ,EAAE,OAAO,CAAC,EAAA;;gBAAtC,SAAsC,CAAC;;;gBAGnC,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC;qBAChD,IAAA,yBAAc,EAAC,YAAY,EAAE,YAAY,CAAC,EAA1C,wBAA0C;gBAC5C,qBAAM,IAAA,iCAAe,EAAC,QAAQ,EAAE,OAAO,CAAC,EAAA;;gBAAxC,SAAwC,CAAC;;;gBAG3C,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACjB,QAAQ,CAAC,GAAG,CACV,IAAI;oBACF,OAAO,CAAC,WAAW,CAAC,SAAS;oBAC7B,GAAG;oBACH,OAAO,CAAC,aAAa;oBACrB,QAAQ,CACX,CAAC;gBAEF,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;;;;KAClB,CAAC;AApCW,QAAA,YAAY,gBAoCvB"}
+{"version":3,"file":"setupContext.js","sourceRoot":"","sources":["../../../../../../src/apps/cli/commands/project/setup/setupContext.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAAkE;AAElE,iDAAgD;AAChD,iDAAgD;AAChD,qDAAoD;AAE7C,IAAM,YAAY,GAAG,UAC1B,QAAyB,EACzB,OAAgB;;;;;gBAEhB,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACjB,QAAQ,CAAC,GAAG,CACV,oFAAoF,CACrF,CAAC;gBAEF,QAAQ,CAAC,GAAG,CACV,mBAAmB;oBACjB,OAAO,CAAC,WAAW,CAAC,SAAS;oBAC7B,GAAG;oBACH,OAAO,CAAC,aAAa;oBACrB,KAAK,CACR,CAAC;gBACF,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;qBACb,IAAA,yBAAc,EAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,iBAAiB,CAAC,EAAjE,wBAAiE;gBACnE,qBAAM,IAAA,6BAAa,EAAC,QAAQ,EAAE,OAAO,CAAC,EAAA;;gBAAtC,SAAsC,CAAC;;;qBAErC,IAAA,sBAAW,EAAC,OAAO,CAAC,EAApB,wBAAoB;gBACtB,qBAAM,IAAA,6BAAa,EAAC,QAAQ,EAAE,OAAO,CAAC,EAAA;;gBAAtC,SAAsC,CAAC;;;gBAGnC,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC;qBAChD,IAAA,yBAAc,EAAC,YAAY,EAAE,YAAY,CAAC,EAA1C,wBAA0C;gBAC5C,qBAAM,IAAA,iCAAe,EAAC,QAAQ,EAAE,OAAO,CAAC,EAAA;;gBAAxC,SAAwC,CAAC;;;gBAG3C,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACjB,QAAQ,CAAC,GAAG,CACV,IAAI;oBACF,OAAO,CAAC,WAAW,CAAC,SAAS;oBAC7B,GAAG;oBACH,OAAO,CAAC,aAAa;oBACrB,QAAQ,CACX,CAAC;gBAEF,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;;;;KAClB,CAAC;AAvCW,QAAA,YAAY,gBAuCvB"}

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/shared/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,8CAAwB;AAEjB,IAAM,mBAAmB,GAAG,UACjC,OAAuC,EACvC,SAAkB,EAClB,oBAAwB;IAAxB,qCAAA,EAAA,wBAAwB;;;;YAElB,QAAQ,GAAG,qCAA8B,OAAO,CAAC,IAAI,SACzD,SAAS,CAAC,CAAC,CAAC,0BAAmB,SAAS,CAAE,CAAC,CAAC,CAAC,EAAE,CAC/C,CAAC;YAEG,GAAG,GAAG,+DACV,OAAO,CAAC,SAAS,SAEjB,QAAQ,CAAC,CAAC,CAAC,oBAAa,kBAAkB,CAAC,QAAQ,CAAC,CAAE,CAAC,CAAC,CAAC,EAAE,uBAChD,oBAAoB,CAAE,CAAC;YACpC,IAAA,iBAAI,EAAC,GAAG,CAAC,CAAC;;;;CACX,CAAC;AAfW,QAAA,mBAAmB,uBAe9B;AAEK,IAAM,kCAAkC,GAAG,UAChD,OAAsC,EACtC,SAAiB,EACjB,oBAAwB;IAAxB,qCAAA,EAAA,wBAAwB;;;;YAMlB,SAAS,GAAG,wCAA4B,OAAO,CAAC,MAAM,cAAI,OAAO,CAAC,IAAI,0BAAY,SAAS,qDAA6C,CAAC;YACzI,GAAG,GAAG,wEAAiE,oBAAoB,sBAC/F,OAAO,CAAC,SAAS,wBACL,kBAAkB,CAAC,SAAS,CAAC,CAAE,CAAC;YAE9C,IAAA,iBAAI,EAAC,GAAG,CAAC,CAAC;;;;CACX,CAAC;AAfW,QAAA,kCAAkC,sCAe7C"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/shared/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,8CAAwB;AAEjB,IAAM,mBAAmB,GAAG,UACjC,OAAuC,EACvC,SAAkB,EAClB,oBAAwB;IAAxB,qCAAA,EAAA,wBAAwB;;;;YAElB,QAAQ,GAAG,qCAA8B,OAAO,CAAC,IAAI,SACzD,SAAS,CAAC,CAAC,CAAC,0BAAmB,SAAS,CAAE,CAAC,CAAC,CAAC,EAAE,CAC/C,CAAC;YAEG,GAAG,GAAG,+DACV,OAAO,CAAC,SAAS,SAEjB,QAAQ,CAAC,CAAC,CAAC,oBAAa,kBAAkB,CAAC,QAAQ,CAAC,CAAE,CAAC,CAAC,CAAC,EAAE,uBAChD,oBAAoB,CAAE,CAAC;YACpC,IAAA,iBAAI,EAAC,GAAG,CAAC,CAAC;;;;CACX,CAAC;AAfW,QAAA,mBAAmB,uBAe9B;AAEK,IAAM,kCAAkC,GAAG,UAChD,OAAsC,EACtC,SAAiB,EACjB,oBAAwB;IAAxB,qCAAA,EAAA,wBAAwB;;;;YAElB,SAAS,GAAG,wCAA4B,OAAO,CAAC,MAAM,cAAI,OAAO,CAAC,IAAI,0BAAY,SAAS,qDAA6C,CAAC;YACzI,GAAG,GAAG,wEAAiE,oBAAoB,sBAC/F,OAAO,CAAC,SAAS,wBACL,kBAAkB,CAAC,SAAS,CAAC,CAAE,CAAC;YAE9C,IAAA,iBAAI,EAAC,GAAG,CAAC,CAAC;;;;CACX,CAAC;AAXW,QAAA,kCAAkC,sCAW7C"}

package/dist/bundles/catenv/index.js

@@ -614,8 +614,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 exports.__esModule = true;
 exports.upsertAllVariables = exports.getVariableValueByRawName = exports.getAllVariables = exports.getProjectInfo = exports.doGitlabRequest = exports.getGitlabToken = exports.setupGitlabToken = exports.hasGitlabToken = void 0;
-var child_process_promise_1 = __nccwpck_require__(5763);
 var pipeline_1 = __nccwpck_require__(5355);
+var child_process_promise_1 = __nccwpck_require__(5763);
 var lodash_1 = __nccwpck_require__(3255);
 var memoizee_1 = __importDefault(__nccwpck_require__(5839));
 var node_fetch_1 = __importDefault(__nccwpck_require__(6372));
@@ -38817,7 +38817,7 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
 };
 
 exports.__esModule = true;
-exports.createDockerBuildJobDefault = exports.createDockerBuildJobBase = exports.DOCKER_BUILD_JOB_NAME = exports.getDockerBuildVariables = exports.requiresDockerBuild = exports.getDockerImageVariables = void 0;
+exports.createDockerBuildJobDefault = 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);
 
@@ -38852,6 +38852,10 @@ var requiresDockerBuild = function (context) {
     return true;
   }
 
+  if ((0, deploy_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
+    return true;
+  }
+
   if ((0, deploy_1.isOfDeployType)(deployConfig, "custom") && deployConfig.requiresDocker) {
     return true;
   }
@@ -38879,33 +38883,41 @@ var getDockerBuildVariables = function (context) {
 exports.getDockerBuildVariables = getDockerBuildVariables;
 exports.DOCKER_BUILD_JOB_NAME = "🔨 docker";
 
-var createDockerBuildJobBase = function (context, _a) {
-  var script = _a.script,
-      variables = _a.variables,
-      def = __rest(_a, ["script", "variables"]);
-
-  return (0, lodash_1.merge)({
-    name: exports.DOCKER_BUILD_JOB_NAME,
-    envMode: "jobPerEnv",
-    stage: "build",
+var getDockerJobBaseProps = function (context) {
+  return {
     image: (0, runner_1.getRunnerImage)("docker-build"),
     services: [{
       name: "docker:20-dind",
       command: ["--tls=false"]
     }],
-    variables: __assign(__assign({}, (0, exports.getDockerBuildVariables)(context)), variables !== null && variables !== void 0 ? variables : {}),
+    variables: (0, exports.getDockerBuildVariables)(context)
+  };
+};
+
+exports.getDockerJobBaseProps = getDockerJobBaseProps;
+
+var createDockerBuildJobBase = function (context, _a) {
+  var script = _a.script,
+      def = __rest(_a, ["script"]);
+
+  return (0, lodash_1.merge)(__assign(__assign({
+    name: exports.DOCKER_BUILD_JOB_NAME,
+    envMode: "jobPerEnv",
+    stage: "build"
+  }, (0, exports.getDockerJobBaseProps)(context)), {
     script: script || []
-  }, def);
+  }), def);
 };
 
 exports.createDockerBuildJobBase = createDockerBuildJobBase;
+exports.gitlabDockerLogin = "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY";
 
 var createDockerBuildJobDefault = function (context, _a) {
   var script = _a.script,
       def = __rest(_a, ["script"]);
 
   return (0, exports.createDockerBuildJobBase)(context, __assign({
-    script: __spreadArray(__spreadArray([], __read(script || []), false), ["docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY", "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)
+    script: __spreadArray(__spreadArray([], __read(script || []), false), [exports.gitlabDockerLogin, "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)
   }, def));
 };
 
@@ -39806,11 +39818,67 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-d4af38d9" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-6b263a90" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
 
+/***/ 486:
+/***/ (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);
+};
+
+var __importDefault = this && this.__importDefault || function (mod) {
+  return mod && mod.__esModule ? mod : {
+    "default": mod
+  };
+};
+
+exports.__esModule = true;
+exports.getLabels = void 0;
+
+var slugify_1 = __importDefault(__nccwpck_require__(4035));
+
+var sanitize = function (value) {
+  if (!value) return value; //"The value can only contain lowercase letters, numeric characters, underscores and dashes. The value can be at most 63 characters long. International characters are allowed."
+  // slugify should do the job
+
+  return (0, slugify_1["default"])(value).toLowerCase();
+};
+
+var getLabels = function (context) {
+  var _a, _b, _c;
+
+  var labels = __assign({
+    "customer-name": sanitize(context.fullConfig.customerName),
+    "app-name": sanitize(context.fullConfig.appName),
+    "env-type": sanitize(context.environment.envType),
+    "env-name": sanitize(context.environment.shortName),
+    "build-type": sanitize((_a = context.componentConfig.build) === null || _a === void 0 ? void 0 : _a.type)
+  }, (_c = (_b = context.fullConfig.meta) === null || _b === void 0 ? void 0 : _b.labels) !== null && _c !== void 0 ? _c : {});
+
+  return labels;
+};
+
+exports.getLabels = getLabels;
+
+/***/ }),
+
 /***/ 2041:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
@@ -40024,6 +40092,8 @@ var build_1 = __nccwpck_require__(3760);
 
 var deploy_1 = __nccwpck_require__(223);
 
+var types_1 = __nccwpck_require__(3109);
+
 var config_1 = __nccwpck_require__(9997);
 
 var utils_1 = __nccwpck_require__(7461);
@@ -40110,7 +40180,7 @@ var getEnvironment = function (config, componentName, env, commitInfo, alreadyVi
             envInUrl = envType === "review" && commitInfo ? "".concat(commitInfo.reviewSlug, ".").concat(env) : env;
             domainCanonical = (mergedConfig === null || mergedConfig === void 0 ? void 0 : mergedConfig.deploy) && (mergedConfig === null || mergedConfig === void 0 ? void 0 : mergedConfig.deploy.type) === "kubernetes" && ((_e = mergedConfig.deploy.cluster) === null || _e === void 0 ? void 0 : _e.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
             config.domainCanonical || "panter.cloud";
-            HOST_CANONICAL = "".concat(componentSlug, ".").concat(envInUrl, ".").concat(config.appName, ".").concat(config.customerName, ".").concat(domainCanonical);
+            HOST_CANONICAL = (0, types_1.isOfDeployType)(mergedConfig.deploy, "kubernetes") ? "".concat(componentSlug, ".").concat(envInUrl, ".").concat(config.appName, ".").concat(config.customerName, ".").concat(domainCanonical) : (0, types_1.isOfDeployType)(mergedConfig.deploy, "google-cloudrun") ? environmentSlug + "-" + process.env[(0, exports.getSecretVarName)(env, componentName, deploy_1.GCLOUD_RUN_CANONICAL_HOST_SUFFIX)] : "";
             host = (_f = mergedConfig === null || mergedConfig === void 0 ? void 0 : mergedConfig.host) !== null && _f !== void 0 ? _f : HOST_CANONICAL;
             url_1 = "https://".concat(host);
             KUBE_APP_NAME_PREFIX = envType === "review" && commitInfo ? "".concat(commitInfo.reviewSlug, "-") : "";
@@ -40751,6 +40821,169 @@ exports.getBaseRollbackJob = getBaseRollbackJob;
 
 /***/ }),
 
+/***/ 2256:
+/***/ (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.createDeployJob = void 0;
+
+var js_yaml_1 = __nccwpck_require__(3618);
+
+var lodash_1 = __nccwpck_require__(3255);
+
+var _1 = __nccwpck_require__(1344);
+
+var docker_1 = __nccwpck_require__(3219);
+
+var getLabels_1 = __nccwpck_require__(486);
+
+var runner_1 = __nccwpck_require__(5071);
+
+var base_1 = __nccwpck_require__(9177);
+
+var types_1 = __nccwpck_require__(3109);
+
+var gcloudServiceAccountLoginCommands_1 = __nccwpck_require__(2607);
+
+var createDeployJob = function (context) {
+  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 not custom");
+  }
+
+  var baseDeploymentJob = (0, base_1.getBaseDeploymentJob)(context);
+  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, "/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG");
+
+  var pushImageToArtifactsRegistry = __spreadArray(__spreadArray([docker_1.gitlabDockerLogin], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), ["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)], false);
+
+  var allEnvVars = (0, lodash_1.omit)(context.environment.envVars, _1.GCLOUD_DEPLOY_CREDENTIALS_KEY);
+  var serviceName = context.environment.slug;
+  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 command = context.componentConfig.build.startCommand ? "--command=\"".concat(context.componentConfig.build.startCommand.split(" ").join(","), "\"") : ""; // TODO: split secrets out
+
+  var cloudRunDeploy = ["echo \"$ENV_VARS\" > ____envvars.yaml", "gcloud run deploy ".concat(serviceName, " --image ").concat(gcloudImageName, " --region=").concat(deployConfig.region, " --allow-unauthenticated --project ").concat(deployConfig.projectId, " ").concat(command, " --env-vars-file=____envvars.yaml --labels ").concat(labelsString), "docker image rm ".concat(gcloudImageName)];
+  var baseStopJob = (0, base_1.getBaseDeploymentStopJob)(context);
+  return [(0, lodash_1.merge)({}, baseDeploymentJob, (0, docker_1.getDockerJobBaseProps)(context), {
+    artifacts: {
+      paths: ["____envvars.yaml"]
+    },
+    variables: {
+      ENV_VARS: (0, js_yaml_1.dump)(allEnvVars, {
+        lineWidth: -1,
+        quotingType: "'",
+        forceQuotes: true
+      })
+    },
+    image: (0, runner_1.getRunnerImage)("gcloud"),
+    script: __spreadArray(__spreadArray([], __read(pushImageToArtifactsRegistry), false), __read(cloudRunDeploy), false)
+  }), (0, lodash_1.merge)({}, baseStopJob, {
+    image: (0, runner_1.getRunnerImage)("gcloud"),
+    script: __spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), ["gcloud run services delete ".concat(serviceName, " --project ").concat(deployConfig.projectId, " --region=").concat(deployConfig.region, " --quiet")], false)
+  })];
+};
+
+exports.createDeployJob = createDeployJob;
+
+/***/ }),
+
+/***/ 1344:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+exports.__esModule = true;
+exports.GCLOUD_RUN_DEPLOY_TYPE = exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX = exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = void 0;
+
+var deployJob_1 = __nccwpck_require__(2256);
+
+exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = "GCLOUD_DEPLOY_credentialsKey";
+exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX = "GCLOUD_RUN_canonicalHostSuffix";
+exports.GCLOUD_RUN_DEPLOY_TYPE = {
+  jobs: deployJob_1.createDeployJob,
+  defaults: function () {
+    return {};
+  },
+  additionalSecretKeys: function () {
+    return [exports.GCLOUD_DEPLOY_CREDENTIALS_KEY];
+  }
+};
+
+/***/ }),
+
+/***/ 2607:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+exports.__esModule = true;
+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\""];
+};
+
+exports.gcloudServiceAccountLoginCommands = gcloudServiceAccountLoginCommands;
+
+/***/ }),
+
 /***/ 3539:
 /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
 
@@ -40760,7 +40993,7 @@ exports.getBaseRollbackJob = getBaseRollbackJob;
 exports.__esModule = true;
 exports.getCloudSQLConfig = exports.hasCloudSQL = void 0;
 
-var types_1 = __nccwpck_require__(9702);
+var types_1 = __nccwpck_require__(3109);
 
 var hasCloudSQL = function (context) {
   var _a, _b;
@@ -40840,7 +41073,7 @@ var yarn_1 = __nccwpck_require__(464);
 
 var base_1 = __nccwpck_require__(9177);
 
-var types_1 = __nccwpck_require__(9702);
+var types_1 = __nccwpck_require__(3109);
 
 var createCustomDeployJobs = function (context) {
   var deployConfig = context.componentConfig.deploy;
@@ -40858,17 +41091,11 @@ var createCustomDeployJobs = function (context) {
   var yarnInstall = (0, yarn_1.getYarnInstall)(context);
   return [(0, lodash_1.merge)({}, baseDeploymentJob, {
     image: deployConfig.image ? (0, __1.getRunnerImage)(deployConfig.image) : undefined,
-    script: __spreadArray(__spreadArray(["cd ".concat(context.componentConfig.dir)], __read(requiresYarnInstall(context) ? yarnInstall : []), false), __read(deployConfig.script), false)
+    script: __spreadArray(__spreadArray(["cd ".concat(context.componentConfig.dir)], __read(deployConfig.requiresYarnInstall ? yarnInstall : []), false), __read(deployConfig.script), false)
   })];
 };
 
 exports.createCustomDeployJobs = createCustomDeployJobs;
-var buildTypesThatRequireYarn = ["meteor", "node", "node-static", "storybook"];
-
-var requiresYarnInstall = function (context) {
-  var buildConfig = context.componentConfig.build;
-  return buildTypesThatRequireYarn.includes(buildConfig.type);
-};
 
 /***/ }),
 
@@ -40921,21 +41148,26 @@ var __exportStar = this && this.__exportStar || function (m, exports) {
 exports.__esModule = true;
 exports.DEPLOY_TYPES = void 0;
 
+var cloudRun_1 = __nccwpck_require__(1344);
+
 var custom_1 = __nccwpck_require__(5599);
 
 var kubernetes_1 = __nccwpck_require__(5682);
 
 __exportStar(__nccwpck_require__(5682), exports);
 
-__exportStar(__nccwpck_require__(9702), exports);
+__exportStar(__nccwpck_require__(3109), exports);
 
 __exportStar(__nccwpck_require__(2757), exports);
 
 __exportStar(__nccwpck_require__(3539), exports);
 
+__exportStar(__nccwpck_require__(1344), exports);
+
 exports.DEPLOY_TYPES = {
   kubernetes: kubernetes_1.KUBERNETES_DEPLOY_TYPE,
-  custom: custom_1.CUSTOM_DEPLOY_TYPE
+  custom: custom_1.CUSTOM_DEPLOY_TYPE,
+  "google-cloudrun": cloudRun_1.GCLOUD_RUN_DEPLOY_TYPE
 };
 
 /***/ }),
@@ -41065,7 +41297,7 @@ var runner_1 = __nccwpck_require__(5071);
 
 var base_1 = __nccwpck_require__(9177);
 
-var types_1 = __nccwpck_require__(9702);
+var types_1 = __nccwpck_require__(3109);
 
 var kubeValues_1 = __nccwpck_require__(1061);
 
@@ -41201,7 +41433,7 @@ var __read = this && this.__read || function (o, n) {
 exports.__esModule = true;
 exports.createKubeEnv = void 0;
 
-var types_1 = __nccwpck_require__(9702);
+var types_1 = __nccwpck_require__(3109);
 
 var shouldGoIntoSecrets = function (key, value) {
   var _a;
@@ -41276,7 +41508,7 @@ var utils_1 = __nccwpck_require__(7461);
 
 var cloudSql_1 = __nccwpck_require__(3539);
 
-var types_1 = __nccwpck_require__(9702);
+var types_1 = __nccwpck_require__(3109);
 
 var cloudsql_1 = __nccwpck_require__(395);
 
@@ -41539,15 +41771,58 @@ exports.processSecretsAsFiles = processSecretsAsFiles;
 
 /***/ }),
 
-/***/ 9702:
+/***/ 438:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+
+exports.__esModule = true;
+
+/***/ }),
+
+/***/ 2689:
 /***/ ((__unused_webpack_module, exports) => {
 
 "use strict";
 
 
+exports.__esModule = true;
+
+/***/ }),
+
+/***/ 3109:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+
+var __createBinding = this && this.__createBinding || (Object.create ? function (o, m, k, k2) {
+  if (k2 === undefined) k2 = k;
+  Object.defineProperty(o, k2, {
+    enumerable: true,
+    get: function () {
+      return m[k];
+    }
+  });
+} : function (o, m, k, k2) {
+  if (k2 === undefined) k2 = k;
+  o[k2] = m[k];
+});
+
+var __exportStar = this && this.__exportStar || function (m, exports) {
+  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+
 exports.__esModule = true;
 exports.isOfDeployType = void 0;
 
+__exportStar(__nccwpck_require__(438), exports);
+
+__exportStar(__nccwpck_require__(2689), exports);
+
+__exportStar(__nccwpck_require__(5299), exports);
+
 var isOfDeployType = function (t) {
   var types = [];
 
@@ -41562,6 +41837,16 @@ exports.isOfDeployType = isOfDeployType;
 
 /***/ }),
 
+/***/ 5299:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+
+exports.__esModule = true;
+
+/***/ }),
+
 /***/ 2757:
 /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
 
@@ -41571,7 +41856,7 @@ exports.isOfDeployType = isOfDeployType;
 exports.__esModule = true;
 exports.contextIsStoppable = exports.getKubernetesNamespace = exports.getFullKubernetesClusterName = void 0;
 
-var types_1 = __nccwpck_require__(9702);
+var types_1 = __nccwpck_require__(3109);
 
 var getFullKubernetesClusterName = function (cluster) {
   if (cluster.type === "gcloud") {