@catladder/pipeline 0.0.0-more-collapse-deeb54d7 → 0.0.0-multiple-gitlab-includes-3df5566d

package/dist/build/custom/buildJob.js

@@ -1,81 +1,22 @@
 "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 __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;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createCustomBuildJobs = void 0;
-var path_1 = require("path");
-var utils_1 = require("../../utils");
 var docker_1 = require("../docker");
 var types_1 = require("../types");
 var base_1 = require("../base");
-var RUNNER_BUILD_VARIABLES = {
-  KUBERNETES_CPU_REQUEST: "0.5",
-  KUBERNETES_CPU_LIMIT: "2",
-  KUBERNETES_MEMORY_REQUEST: "2Gi",
-  KUBERNETES_MEMORY_LIMIT: "4Gi"
-};
+var createBuildJobDefinition_1 = require("../base/createBuildJobDefinition");
 var createCustomBuildJobs = function (context) {
-  var _a, _b, _c, _d;
-  var buildConfig = context.componentConfig.build;
+  var buildConfig = context.build.config;
   if (!(0, types_1.isOfBuildType)(buildConfig, "custom")) {
     throw new Error("deploy config is not custom");
   }
-  return (0, base_1.createBuildJobs)(context, {
-    appBuild: buildConfig.buildCommand !== null ? {
-      image: buildConfig.jobImage,
-      variables: __assign({}, RUNNER_BUILD_VARIABLES),
-      cache: buildConfig.jobCache,
-      services: buildConfig.jobServices,
-      script: __spreadArray([], __read((_a = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _a !== void 0 ? _a : []), false),
-      artifacts: {
-        paths: __spreadArray([(0, path_1.join)(context.componentConfig.dir, "__build_info.json"), (0, path_1.join)(context.componentConfig.dir, "dist")], __read((_c = (_b = buildConfig.artifactsPaths) === null || _b === void 0 ? void 0 : _b.map(function (path) {
-          return (0, path_1.join)(context.componentConfig.dir, path);
-        })) !== null && _c !== void 0 ? _c : []), false),
-        expire_in: "1 day"
-      }
-    } : undefined,
+  return (0, base_1.createComponentBuildJobs)(context, {
+    appBuild: buildConfig.buildCommand !== null ? (0, createBuildJobDefinition_1.createBuildJobDefinition)(context, buildConfig) : undefined,
     dockerBuild: {
-      script: (0, docker_1.getDockerBuildDefaultScript)(((_d = buildConfig.docker) === null || _d === void 0 ? void 0 : _d.type) === "nginx" ? "ensureNginxDockerfile" : ""),
+      script: (0, docker_1.getDockerBuildScriptWithBuiltInDockerFile)(context),
       variables: {}
     }
   });

package/dist/build/custom/index.d.ts

@@ -1,3 +1,3 @@
-import type { Context } from "../../types/context";
+import type { ComponentContext } from "../../types/context";
 import type { CatladderJob } from "../../types/jobs";
-export declare const createCustomJobs: (context: Context) => CatladderJob[];
+export declare const createCustomJobs: (context: ComponentContext) => CatladderJob[];

package/dist/build/custom/index.js

@@ -31,7 +31,9 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createCustomJobs = void 0;
 var buildJob_1 = require("./buildJob");
 var testJob_1 = require("./testJob");

package/dist/build/custom/testJob.d.ts

@@ -1,7 +1,7 @@
-import type { Context } from "../../types/context";
-import type { CatladderJob } from "../../types/jobs";
 import type { Artifacts } from "../../types";
-export declare const createCustomTestJobs: (context: Context) => CatladderJob[];
-export declare type OptionalArtifacts = {
+import type { ComponentContext } from "../../types/context";
+import type { CatladderJob } from "../../types/jobs";
+export declare const createCustomTestJobs: (context: ComponentContext) => CatladderJob[];
+export type OptionalArtifacts = {
   artifacts: Artifacts;
 } | undefined;

package/dist/build/custom/testJob.js

@@ -41,33 +41,37 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createCustomTestJobs = void 0;
 var utils_1 = require("../../utils");
-var types_1 = require("../types");
 var createArtifactsConfig_1 = require("../base/createArtifactsConfig");
+var createJobCache_1 = require("../cache/createJobCache");
+var types_1 = require("../types");
 var RUNNER_CUSTOM_TEST_VARIABLES = {
-  KUBERNETES_CPU_REQUEST: "0.5",
-  KUBERNETES_CPU_LIMIT: "2",
-  KUBERNETES_MEMORY_REQUEST: "2Gi",
+  KUBERNETES_CPU_REQUEST: "0.45",
+  KUBERNETES_MEMORY_REQUEST: "1Gi",
   KUBERNETES_MEMORY_LIMIT: "4Gi"
 };
 var createCustomTestJobs = function (context) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
   // don't run tests after release
-  if (((_a = context.commitInfo) === null || _a === void 0 ? void 0 : _a.trigger) === "taggedRelease") {
+  // TODO: this will be replaced by using rules
+  if (context.trigger === "taggedRelease") {
     return [];
   }
-  var buildConfig = context.componentConfig.build;
+  var buildConfig = context.build.config;
   if (!(0, types_1.isOfBuildType)(buildConfig, "custom")) {
     throw new Error("deploy config is not custom");
   }
   var base = {
-    variables: __assign(__assign(__assign({
-      APP_PATH: context.componentConfig.dir
-    }, RUNNER_CUSTOM_TEST_VARIABLES), context.environment.jobOnlyVars.build.envVars), (_b = buildConfig.extraVars) !== null && _b !== void 0 ? _b : {}),
+    variables: __assign({
+      APP_PATH: context.build.dir
+    }, context.environment.jobOnlyVars.build.envVars),
+    runnerVariables: RUNNER_CUSTOM_TEST_VARIABLES,
     services: buildConfig.jobServices,
-    cache: buildConfig.jobCache,
+    cache: (0, createJobCache_1.createJobCacheFromConfig)(context, buildConfig),
     stage: "test",
     needs: [],
     envMode: "none"
@@ -75,23 +79,23 @@ var createCustomTestJobs = function (context) {
   var auditJob = buildConfig.audit ? __assign(__assign(__assign({
     name: "🛡 audit"
   }, base), {
-    image: (_d = (_c = buildConfig.audit) === null || _c === void 0 ? void 0 : _c.jobImage) !== null && _d !== void 0 ? _d : buildConfig.jobImage,
+    image: (_b = (_a = buildConfig.audit) === null || _a === void 0 ? void 0 : _a.jobImage) !== null && _b !== void 0 ? _b : buildConfig.jobImage,
     cache: undefined,
-    script: __spreadArray([], __read((_f = (0, utils_1.ensureArray)((_e = buildConfig.audit) === null || _e === void 0 ? void 0 : _e.command)) !== null && _f !== void 0 ? _f : []), false),
+    script: __spreadArray([], __read((0, utils_1.ensureArray)((_c = buildConfig.audit) === null || _c === void 0 ? void 0 : _c.command)), false),
     allow_failure: true
-  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.componentConfig.dir, (_g = buildConfig.audit) === null || _g === void 0 ? void 0 : _g.artifactsReports, (_h = buildConfig.audit) === null || _h === void 0 ? void 0 : _h.artifacts)) : null;
+  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_d = buildConfig.audit) === null || _d === void 0 ? void 0 : _d.artifactsReports, (_e = buildConfig.audit) === null || _e === void 0 ? void 0 : _e.artifacts)) : null;
   var lintJob = buildConfig.lint ? __assign(__assign(__assign({
     name: "👮 lint"
   }, base), {
-    image: (_k = (_j = buildConfig.lint) === null || _j === void 0 ? void 0 : _j.jobImage) !== null && _k !== void 0 ? _k : buildConfig.jobImage,
-    script: __spreadArray([], __read((_m = (0, utils_1.ensureArray)((_l = buildConfig.lint) === null || _l === void 0 ? void 0 : _l.command)) !== null && _m !== void 0 ? _m : []), false)
-  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.componentConfig.dir, (_o = buildConfig.lint) === null || _o === void 0 ? void 0 : _o.artifactsReports, (_p = buildConfig.lint) === null || _p === void 0 ? void 0 : _p.artifacts)) : null;
+    image: (_g = (_f = buildConfig.lint) === null || _f === void 0 ? void 0 : _f.jobImage) !== null && _g !== void 0 ? _g : buildConfig.jobImage,
+    script: __spreadArray([], __read((0, utils_1.ensureArray)((_h = buildConfig.lint) === null || _h === void 0 ? void 0 : _h.command)), false)
+  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_j = buildConfig.lint) === null || _j === void 0 ? void 0 : _j.artifactsReports, (_k = buildConfig.lint) === null || _k === void 0 ? void 0 : _k.artifacts)) : null;
   var testJob = buildConfig.test ? __assign(__assign(__assign({
     name: "🧪 test"
   }, base), {
-    image: (_r = (_q = buildConfig.test) === null || _q === void 0 ? void 0 : _q.jobImage) !== null && _r !== void 0 ? _r : buildConfig.jobImage,
-    script: __spreadArray([], __read((_t = (0, utils_1.ensureArray)((_s = buildConfig.test) === null || _s === void 0 ? void 0 : _s.command)) !== null && _t !== void 0 ? _t : []), false)
-  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.componentConfig.dir, (_u = buildConfig.test) === null || _u === void 0 ? void 0 : _u.artifactsReports, (_v = buildConfig.test) === null || _v === void 0 ? void 0 : _v.artifacts)) : null;
+    image: (_m = (_l = buildConfig.test) === null || _l === void 0 ? void 0 : _l.jobImage) !== null && _m !== void 0 ? _m : buildConfig.jobImage,
+    script: __spreadArray([], __read((0, utils_1.ensureArray)((_o = buildConfig.test) === null || _o === void 0 ? void 0 : _o.command)), false)
+  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_p = buildConfig.test) === null || _p === void 0 ? void 0 : _p.artifactsReports, (_q = buildConfig.test) === null || _q === void 0 ? void 0 : _q.artifacts)) : null;
   return [auditJob, lintJob, testJob].filter(utils_1.notNil);
 };
 exports.createCustomTestJobs = createCustomTestJobs;

package/dist/build/docker.d.ts

@@ -1,60 +1,69 @@
-import type { Context } from "../types";
+import type { BuildConfigDocker } from ".";
+import type { ComponentContext, DockerBuildJobDefinition } from "../types";
 import type { CatladderJob } from "../types/jobs";
-export declare const getDockerImageVariables: (context: Context) => {
+export declare const getDockerImageVariables: (context: ComponentContext) => {
+  DOCKER_IMAGE_TAG: string;
+  DOCKER_REGISTRY: string;
+  DOCKER_IMAGE: import("..").StringOrBashExpression;
+  DOCKER_CACHE_IMAGE: string;
+} | {
+  DOCKER_IMAGE_TAG: string;
   DOCKER_REGISTRY: string;
-  DOCKER_REGISTRY_IMAGE_PATH: string;
   DOCKER_CACHE_IMAGE: string;
   DOCKER_IMAGE_NAME: string;
   DOCKER_IMAGE: string;
-  DOCKER_IMAGE_TAG: string;
 };
 /**
  * Weather the context requires a docker build
  */
-export declare const requiresDockerBuild: ({
-  componentConfig: {
-    deploy
-  }
-}: Context) => boolean;
-export declare const getDockerBuildVariables: (context: Context) => {
+export declare const requiresDockerBuild: (context: ComponentContext) => boolean;
+export declare const getDockerBuildVariables: (context: ComponentContext) => {
+  DOCKER_IMAGE_TAG: string;
+  DOCKER_REGISTRY: string;
+  DOCKER_IMAGE: import("..").StringOrBashExpression;
+  DOCKER_CACHE_IMAGE: string;
+  APP_DIR: string;
+  DOCKER_BUILD_CONTEXT: string;
+  DOCKERFILE_ADDITIONS?: undefined;
+  DOCKERFILE_ADDITIONS_END?: undefined;
+} | {
+  DOCKER_IMAGE_TAG: string;
   DOCKER_REGISTRY: string;
-  DOCKER_REGISTRY_IMAGE_PATH: string;
   DOCKER_CACHE_IMAGE: string;
   DOCKER_IMAGE_NAME: string;
   DOCKER_IMAGE: string;
+  APP_DIR: string;
+  DOCKER_BUILD_CONTEXT: string;
+  DOCKERFILE_ADDITIONS?: undefined;
+  DOCKERFILE_ADDITIONS_END?: undefined;
+} | {
   DOCKER_IMAGE_TAG: string;
-  DOCKER_HOST: string;
-  DOCKER_TLS_CERTDIR: string;
-  DOCKER_DRIVER: string;
-  DOCKER_BUILDKIT: string;
+  DOCKER_REGISTRY: string;
+  DOCKER_IMAGE: import("..").StringOrBashExpression;
+  DOCKER_CACHE_IMAGE: string;
+  APP_DIR: string;
+  DOCKER_BUILD_CONTEXT: string;
   DOCKERFILE_ADDITIONS: string | undefined;
   DOCKERFILE_ADDITIONS_END: string | undefined;
+} | {
+  DOCKER_IMAGE_TAG: string;
+  DOCKER_REGISTRY: string;
+  DOCKER_CACHE_IMAGE: string;
+  DOCKER_IMAGE_NAME: string;
+  DOCKER_IMAGE: string;
   APP_DIR: string;
-  DOCKER_DIR: string;
-  KUBERNETES_CPU_REQUEST: string;
-  KUBERNETES_CPU_LIMIT: string;
-  KUBERNETES_MEMORY_REQUEST: string;
-  KUBERNETES_MEMORY_LIMIT: string;
+  DOCKER_BUILD_CONTEXT: string;
+  DOCKERFILE_ADDITIONS: string | undefined;
+  DOCKERFILE_ADDITIONS_END: string | undefined;
 };
 export declare const DOCKER_BUILD_JOB_NAME = "\uD83D\uDD28 docker";
-export declare const getDockerJobBaseProps: (context: Context) => {
-  image: string;
-  services: {
-    name: string;
-    command: string[];
-  }[];
-  variables: {
-    DOCKER_HOST: string;
-    DOCKER_TLS_CERTDIR: string;
-    DOCKER_DRIVER: string;
-    DOCKER_BUILDKIT: string;
-  };
-};
-export declare type DockerBuildJobDefinition = Partial<CatladderJob>;
-export declare const createDockerBuildJobBase: (context: Context, {
+export declare const getDockerJobBaseProps: () => Pick<CatladderJob, "image" | "services" | "variables" | "runnerVariables">;
+export declare const createDockerBuildJobBase: (context: ComponentContext, {
   script,
+  cache,
   ...def
-}: Partial<CatladderJob>) => CatladderJob;
-export declare const gitlabDockerLogin = "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY";
-export declare const getDockerBuildDefaultScript: (ensureDockerFileScript?: string | undefined) => (string | undefined)[];
-export declare const hasDockerfile: (context: Context) => boolean;
+}: DockerBuildJobDefinition) => CatladderJob;
+export declare const gitlabDockerLogin: (context: ComponentContext) => string[];
+export declare const getDockerBuildScriptWithBuiltInDockerFile: (context: ComponentContext, defaultType?: BuildConfigDocker["type"]) => (string | undefined)[];
+export declare const getDockerBuildDefaultScript: (context: ComponentContext, ensureDockerFileScript?: string | null) => (string | undefined)[];
+export declare const hasDockerfile: (context: ComponentContext) => boolean;

package/dist/build/docker.js

@@ -18,93 +18,168 @@ 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.hasDockerfile = exports.getDockerBuildDefaultScript = exports.gitlabDockerLogin = exports.createDockerBuildJobBase = exports.getDockerJobBaseProps = exports.DOCKER_BUILD_JOB_NAME = exports.getDockerBuildVariables = exports.requiresDockerBuild = exports.getDockerImageVariables = void 0;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.hasDockerfile = exports.getDockerBuildDefaultScript = exports.getDockerBuildScriptWithBuiltInDockerFile = exports.gitlabDockerLogin = exports.createDockerBuildJobBase = exports.getDockerJobBaseProps = exports.DOCKER_BUILD_JOB_NAME = exports.getDockerBuildVariables = exports.requiresDockerBuild = exports.getDockerImageVariables = void 0;
+var fs_1 = require("fs");
 var lodash_1 = require("lodash");
+var path_1 = __importDefault(require("path"));
 var deploy_1 = require("../deploy");
+var artifactsRegistry_1 = require("../deploy/cloudRun/artifactsRegistry");
+var gcloudServiceAccountLoginCommands_1 = require("../deploy/cloudRun/utils/gcloudServiceAccountLoginCommands");
 var runner_1 = require("../runner");
-var fs_1 = require("fs");
-var path_1 = __importDefault(require("path"));
-var DOCKER_RUNNER_BUILD_VARIABLES = {
-  KUBERNETES_CPU_REQUEST: "0.5",
-  KUBERNETES_CPU_LIMIT: "1",
+var gitlab_1 = require("../utils/gitlab");
+var createJobCache_1 = require("./cache/createJobCache");
+var DOCKER_BUILD_RUNNER_REQUESTS = {
+  KUBERNETES_CPU_REQUEST: "0.45",
   KUBERNETES_MEMORY_REQUEST: "1Gi",
   KUBERNETES_MEMORY_LIMIT: "2Gi"
 };
 var getDockerImageVariables = function (context) {
-  return {
+  var _a;
+  var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
+  return __assign(__assign({}, (0, deploy_1.isOfDeployType)(deployConfig, "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_IMAGE_NAME: context.environment.shortName + "/" + context.componentName,
-    DOCKER_IMAGE: "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
+    DOCKER_CACHE_IMAGE: "$CI_REGISTRY_IMAGE/caches/" + context.name,
+    // ONLY USED IN KUBERNETES
+    DOCKER_IMAGE_NAME: context.env + "/" + context.name,
+    DOCKER_IMAGE: "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME"
+  }), {
     DOCKER_IMAGE_TAG: "$CI_COMMIT_SHA"
-  };
+  });
 };
 exports.getDockerImageVariables = getDockerImageVariables;
 /**
  * Weather the context requires a docker build
  */
-var requiresDockerBuild = function (_a) {
-  var deploy = _a.componentConfig.deploy;
-  return (0, deploy_1.isOfDeployType)(deploy, "kubernetes", "google-cloudrun", "dockerTag") || (0, deploy_1.isOfDeployType)(deploy, "custom") && deploy.requiresDocker;
+var requiresDockerBuild = function (context) {
+  var _a;
+  var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
+  return (0, deploy_1.isOfDeployType)(deployConfig, "kubernetes", "google-cloudrun", "dockerTag") || (0, deploy_1.isOfDeployType)(deployConfig, "custom") && deployConfig.requiresDocker;
 };
 exports.requiresDockerBuild = requiresDockerBuild;
-var getDockerBaseVariables = function () {
+// those need to be runner variables
+var getDockerBuildRunnerVariables = function () {
   return {
     DOCKER_HOST: "tcp://0.0.0.0:2375",
     DOCKER_TLS_CERTDIR: "",
     DOCKER_DRIVER: "overlay2",
-    DOCKER_BUILDKIT: "1"
+    DOCKER_BUILDKIT: "1" // see https://docs.docker.com/develop/develop-images/build_enhancements/
+  };
+};
+var getDockerAdditions = function (build) {
+  var _a, _b;
+  if (!("docker" in build)) return {};
+  if (!build.docker) return {};
+  return {
+    DOCKERFILE_ADDITIONS: "additionsBegin" in build.docker ? (_a = build.docker.additionsBegin) === null || _a === void 0 ? void 0 : _a.join("\n") : undefined,
+    DOCKERFILE_ADDITIONS_END: "additionsEnd" in build.docker ? (_b = build.docker.additionsEnd) === null || _b === void 0 ? void 0 : _b.join("\n") : undefined
   };
 };
 var getDockerBuildVariables = function (context) {
-  var _a, _b, _c, _d;
-  return __assign(__assign(__assign(__assign({}, DOCKER_RUNNER_BUILD_VARIABLES), {
-    DOCKERFILE_ADDITIONS: (_b = (_a = context.componentConfig.build.docker) === null || _a === void 0 ? void 0 : _a.additionsBegin) === null || _b === void 0 ? void 0 : _b.join("\n"),
-    DOCKERFILE_ADDITIONS_END: (_d = (_c = context.componentConfig.build.docker) === null || _c === void 0 ? void 0 : _c.additionsEnd) === null || _d === void 0 ? void 0 : _d.join("\n"),
-    APP_DIR: context.componentConfig.dir,
-    DOCKER_DIR: "."
-  }), getDockerBaseVariables()), (0, exports.getDockerImageVariables)(context));
+  var _a;
+  return __assign(__assign(__assign({}, getDockerAdditions(context.build.config)), {
+    APP_DIR: context.build.dir,
+    DOCKER_BUILD_CONTEXT: "docker" in context.build.config && context.build.config.docker && "buildContextLocation" in context.build.config.docker && ((_a = context.build.config.docker) === null || _a === void 0 ? void 0 : _a.buildContextLocation) === "component" ? context.build.dir : "."
+  }), (0, exports.getDockerImageVariables)(context));
 };
 exports.getDockerBuildVariables = getDockerBuildVariables;
 exports.DOCKER_BUILD_JOB_NAME = "🔨 docker";
-var getDockerJobBaseProps = function (context) {
+var getDockerJobBaseProps = function () {
   return {
     image: (0, runner_1.getRunnerImage)("docker-build"),
     services: [{
-      name: "docker:20-dind",
-      command: ["--tls=false"]
+      name: "docker:24.0.6-dind",
+      // see see https://gitlab.com/gitlab-org/gitlab-runner/-/issues/27300#note_466755332
+      command: ["--tls=false", "--registry-mirror=https://mirror.gcr.io"]
     }],
-    variables: getDockerBaseVariables()
+    variables: {},
+    runnerVariables: getDockerBuildRunnerVariables()
   };
 };
 exports.getDockerJobBaseProps = getDockerJobBaseProps;
 var createDockerBuildJobBase = function (context, _a) {
   var script = _a.script,
-    def = __rest(_a, ["script"]);
+    cache = _a.cache,
+    def = __rest(_a, ["script", "cache"]);
   return (0, lodash_1.merge)(__assign(__assign({
     name: exports.DOCKER_BUILD_JOB_NAME,
     envMode: "jobPerEnv",
-    stage: "build"
-  }, (0, exports.getDockerJobBaseProps)(context)), {
+    stage: "build",
+    cache: cache ? (0, createJobCache_1.createJobCacheFromCacheConfigs)(context, cache) : undefined
+  }, (0, exports.getDockerJobBaseProps)()), {
     script: script || []
   }), {
-    variables: (0, exports.getDockerBuildVariables)(context)
+    variables: (0, exports.getDockerBuildVariables)(context),
+    runnerVariables: __assign(__assign({}, DOCKER_BUILD_RUNNER_REQUESTS), getDockerBuildRunnerVariables())
   }, 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 context.deploy && (0, deploy_1.isOfDeployType)(context.deploy.config, "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 BUILT_IN_ENSURE_DOCKERFILE_SCRIPTS = {
+  meteor: "ensureMeteorDockerfile",
+  node: "ensureNodeDockerfile",
+  nginx: "ensureNginxDockerfile",
+  custom: null
+};
+var getDockerBuildScriptWithBuiltInDockerFile = function (context, defaultType) {
+  var _a;
+  var type = "docker" in context.build.config && context.build.config.docker && "type" in context.build.config.docker ? (_a = context.build.config.docker) === null || _a === void 0 ? void 0 : _a.type : defaultType;
+  return (0, exports.getDockerBuildDefaultScript)(context, type ? BUILT_IN_ENSURE_DOCKERFILE_SCRIPTS[type] : null);
+};
+exports.getDockerBuildScriptWithBuiltInDockerFile = getDockerBuildScriptWithBuiltInDockerFile;
+var getDockerBuildDefaultScript = function (context, ensureDockerFileScript) {
+  return __spreadArray(__spreadArray(__spreadArray([ensureDockerFileScript !== null && ensureDockerFileScript !== void 0 ? ensureDockerFileScript : undefined], __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 $DOCKER_BUILD_CONTEXT --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"));
+  return (0, fs_1.existsSync)(path_1.default.join(context.build.dir, "Dockerfile"));
 };
 exports.hasDockerfile = hasDockerfile;

package/dist/build/index.d.ts

@@ -1,13 +1,20 @@
-import type { Context } from "../types/context";
+import type { ComponentContext, WorkspaceContext } from "../types/context";
 import type { EnvironmentContext } from "../types/environmentContext";
 import type { CatladderJob } from "../types/jobs";
-import type { BuildConfig, BuildConfigType } from "./types";
-export * from "./types";
+import type { BuildConfig, BuildConfigStandaloneType, WorkspaceBuildConfig } from "./types";
 export * from "./node";
-export declare type BuildTypes = { [type in BuildConfigType]: {
-  jobs: (context: Context) => CatladderJob[];
-  defaults: (envContext: EnvironmentContext<BuildConfigType, any>) => Partial<Extract<BuildConfig, {
+export * from "./types";
+export type BuildTypes = { [type in BuildConfigStandaloneType]: {
+  jobs: (context: ComponentContext) => CatladderJob[];
+  defaults: (envContext: EnvironmentContext) => Partial<Extract<BuildConfig, {
+    type: type;
+  }>>;
+} };
+export declare const BUILD_TYPES: BuildTypes;
+export type WorkspaceBuildTypes = { [type in WorkspaceBuildConfig["type"]]: {
+  jobs: (context: WorkspaceContext) => CatladderJob[];
+  defaults: () => Partial<Extract<WorkspaceBuildConfig, {
     type: type;
   }>>;
 } };
-export declare const BUILD_TYPES: BuildTypes;
+export declare const WORKSPACE_BUILD_TYPES: WorkspaceBuildTypes;