@catladder/cli 0.0.0-next-95928577 → 0.0.0-next-e7541a00

package/dist/pipeline/src/build/custom/index.js

@@ -1,10 +1,12 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createCustomJobs = void 0;
 const buildJob_1 = require("./buildJob");
 const testJob_1 = require("./testJob");
-const createCustomJobs = (context) => {
-    return [...(0, testJob_1.createCustomTestJobs)(context), ...(0, buildJob_1.createCustomBuildJobs)(context)];
+const createCustomJobs = async context => {
+  return [...(0, testJob_1.createCustomTestJobs)(context), ...(await (0, buildJob_1.createCustomBuildJobs)(context))];
 };
-exports.createCustomJobs = createCustomJobs;
-//# sourceMappingURL=index.js.map
+exports.createCustomJobs = createCustomJobs;

package/dist/pipeline/src/build/custom/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/custom/index.ts"],"names":[],"mappings":";;;AAEA,yCAAmD;AACnD,uCAAiD;AAE1C,MAAM,gBAAgB,GAAG,CAAC,OAAyB,EAAkB,EAAE;IAC5E,OAAO,CAAC,GAAG,IAAA,8BAAoB,EAAC,OAAO,CAAC,EAAE,GAAG,IAAA,gCAAqB,EAAC,OAAO,CAAC,CAAC,CAAC;AAC/E,CAAC,CAAC;AAFW,QAAA,gBAAgB,oBAE3B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/custom/index.ts"],"names":[],"mappings":";;;AAEA,yCAAmD;AACnD,uCAAiD;AAE1C,MAAM,gBAAgB,GAAG,KAAK,EACnC,OAAkC,EACT,EAAE;IAC3B,OAAO;QACL,GAAG,IAAA,8BAAoB,EAAC,OAAO,CAAC;QAChC,GAAG,CAAC,MAAM,IAAA,gCAAqB,EAAC,OAAO,CAAC,CAAC;KAC1C,CAAC;AACJ,CAAC,CAAC;AAPW,QAAA,gBAAgB,oBAO3B"}

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

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

package/dist/pipeline/src/build/custom/testJob.js

@@ -1,68 +1,77 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createCustomTestJobs = void 0;
+const jobs_1 = require("../../types/jobs");
 const utils_1 = require("../../utils");
 const createArtifactsConfig_1 = require("../base/createArtifactsConfig");
-const createJobCache_1 = require("../cache/createJobCache");
+const getAllCacheConfigsFromConfig_1 = require("../cache/getAllCacheConfigsFromConfig");
 const types_1 = require("../types");
 const RUNNER_CUSTOM_TEST_VARIABLES = {
-    KUBERNETES_CPU_REQUEST: "0.45",
-    KUBERNETES_MEMORY_REQUEST: "1Gi",
-    KUBERNETES_MEMORY_LIMIT: "4Gi",
+  KUBERNETES_CPU_REQUEST: "0.45",
+  KUBERNETES_MEMORY_REQUEST: "1Gi",
+  KUBERNETES_MEMORY_LIMIT: "4Gi"
 };
-const createCustomTestJobs = (context) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
-    // don't run tests after release
-    // TODO: this will be replaced by using rules
-    if (context.trigger === "taggedRelease") {
-        return [];
-    }
-    const buildConfig = context.build.config;
-    if (!(0, types_1.isOfBuildType)(buildConfig, "custom")) {
-        throw new Error("deploy config is not custom");
-    }
-    const base = {
-        variables: {
-            APP_PATH: context.build.dir,
-            ...context.environment.jobOnlyVars.build.envVars,
-        },
-        runnerVariables: RUNNER_CUSTOM_TEST_VARIABLES,
-        services: buildConfig.jobServices,
-        cache: (0, createJobCache_1.createJobCacheFromConfig)(context, buildConfig),
-        stage: "test",
-        needs: [],
-        envMode: "none",
-    };
-    const auditJob = buildConfig.audit
-        ? {
-            name: "🛡 audit",
-            ...base,
-            image: (_b = (_a = buildConfig.audit) === null || _a === void 0 ? void 0 : _a.jobImage) !== null && _b !== void 0 ? _b : buildConfig.jobImage,
-            cache: undefined,
-            script: [...(0, utils_1.ensureArray)((_c = buildConfig.audit) === null || _c === void 0 ? void 0 : _c.command)],
-            allow_failure: true,
-            ...(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;
-    const lintJob = buildConfig.lint
-        ? {
-            name: "👮 lint",
-            ...base,
-            image: (_g = (_f = buildConfig.lint) === null || _f === void 0 ? void 0 : _f.jobImage) !== null && _g !== void 0 ? _g : buildConfig.jobImage,
-            script: [...(0, utils_1.ensureArray)((_h = buildConfig.lint) === null || _h === void 0 ? void 0 : _h.command)],
-            ...(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;
-    const testJob = buildConfig.test
-        ? {
-            name: "🧪 test",
-            ...base,
-            image: (_m = (_l = buildConfig.test) === null || _l === void 0 ? void 0 : _l.jobImage) !== null && _m !== void 0 ? _m : buildConfig.jobImage,
-            script: [...(0, utils_1.ensureArray)((_o = buildConfig.test) === null || _o === void 0 ? void 0 : _o.command)],
-            ...(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);
+const createCustomTestJobs = context => {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0;
+  // don't run tests after release
+  // TODO: this will be replaced by using rules
+  if (context.trigger === "taggedRelease") {
+    return [];
+  }
+  const buildConfig = context.build.config;
+  if (!(0, types_1.isOfBuildType)(buildConfig, "custom")) {
+    throw new Error("deploy config is not custom");
+  }
+  const base = {
+    variables: {
+      APP_PATH: context.build.dir,
+      ...context.environment.jobOnlyVars.build.envVars
+    },
+    services: buildConfig.jobServices,
+    caches: (0, getAllCacheConfigsFromConfig_1.getAllCacheConfigsFromConfig)(context, buildConfig),
+    stage: "test",
+    needs: []
+  };
+  const auditJob = buildConfig.audit ? new jobs_1.CatladderJob({
+    name: "🛡 audit",
+    ...base,
+    runnerVariables: {
+      ...RUNNER_CUSTOM_TEST_VARIABLES,
+      ...((_b = (_a = buildConfig.audit) === null || _a === void 0 ? void 0 : _a.runnerVariables) !== null && _b !== void 0 ? _b : {})
+    },
+    image: (_d = (_c = buildConfig.audit) === null || _c === void 0 ? void 0 : _c.jobImage) !== null && _d !== void 0 ? _d : buildConfig.jobImage,
+    caches: undefined,
+    script: [...(0, utils_1.ensureArray)((_e = buildConfig.audit) === null || _e === void 0 ? void 0 : _e.command)],
+    allow_failure: (_g = (_f = buildConfig.audit) === null || _f === void 0 ? void 0 : _f.allowFailure) !== null && _g !== void 0 ? _g : true,
+    ...(0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_h = buildConfig.audit) === null || _h === void 0 ? void 0 : _h.artifactsReports, (_j = buildConfig.audit) === null || _j === void 0 ? void 0 : _j.artifacts)
+  }) : null;
+  const lintJob = buildConfig.lint ? new jobs_1.CatladderJob({
+    name: "👮 lint",
+    ...base,
+    runnerVariables: {
+      ...RUNNER_CUSTOM_TEST_VARIABLES,
+      ...((_l = (_k = buildConfig.lint) === null || _k === void 0 ? void 0 : _k.runnerVariables) !== null && _l !== void 0 ? _l : {})
+    },
+    image: (_o = (_m = buildConfig.lint) === null || _m === void 0 ? void 0 : _m.jobImage) !== null && _o !== void 0 ? _o : buildConfig.jobImage,
+    script: [...(0, utils_1.ensureArray)((_p = buildConfig.lint) === null || _p === void 0 ? void 0 : _p.command)],
+    allow_failure: (_q = buildConfig.lint) === null || _q === void 0 ? void 0 : _q.allowFailure,
+    ...(0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_r = buildConfig.lint) === null || _r === void 0 ? void 0 : _r.artifactsReports, (_s = buildConfig.lint) === null || _s === void 0 ? void 0 : _s.artifacts)
+  }) : null;
+  const testJob = buildConfig.test ? new jobs_1.CatladderJob({
+    name: "🧪 test",
+    ...base,
+    runnerVariables: {
+      ...RUNNER_CUSTOM_TEST_VARIABLES,
+      ...((_u = (_t = buildConfig.test) === null || _t === void 0 ? void 0 : _t.runnerVariables) !== null && _u !== void 0 ? _u : {})
+    },
+    image: (_w = (_v = buildConfig.test) === null || _v === void 0 ? void 0 : _v.jobImage) !== null && _w !== void 0 ? _w : buildConfig.jobImage,
+    script: [...(0, utils_1.ensureArray)((_x = buildConfig.test) === null || _x === void 0 ? void 0 : _x.command)],
+    allow_failure: (_y = buildConfig.test) === null || _y === void 0 ? void 0 : _y.allowFailure,
+    ...(0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_z = buildConfig.test) === null || _z === void 0 ? void 0 : _z.artifactsReports, (_0 = buildConfig.test) === null || _0 === void 0 ? void 0 : _0.artifacts)
+  }) : null;
+  return [auditJob, lintJob, testJob].filter(utils_1.notNil);
 };
-exports.createCustomTestJobs = createCustomTestJobs;
-//# sourceMappingURL=testJob.js.map
+exports.createCustomTestJobs = createCustomTestJobs;

package/dist/pipeline/src/build/custom/testJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"testJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/custom/testJob.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"testJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/custom/testJob.ts"],"names":[],"mappings":"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"}

package/dist/pipeline/src/build/docker.d.ts

@@ -1,65 +1,73 @@
 import type { BuildConfigDocker } from ".";
-import type { ComponentContext, DockerBuildJobDefinition } from "../types";
-import type { CatladderJob } from "../types/jobs";
+import type { ComponentContext, ComponentContextWithBuild, DockerBuildJobDefinition } from "../types";
+import { CatladderJob } from "../types/jobs";
 export declare const getDockerImageVariables: (context: ComponentContext) => {
-    DOCKER_IMAGE_TAG: string;
-    DOCKER_REGISTRY: string;
-    DOCKER_IMAGE: import("..").StringOrBashExpression;
-    DOCKER_CACHE_IMAGE: string;
+  DOCKER_IMAGE_TAG: import("..").BashExpression;
+  DOCKER_REGISTRY: string;
+  DOCKER_IMAGE: import("..").StringOrBashExpression;
+  DOCKER_CACHE_IMAGE: string;
 } | {
-    DOCKER_IMAGE_TAG: string;
-    DOCKER_REGISTRY: string;
-    DOCKER_CACHE_IMAGE: string;
-    DOCKER_IMAGE_NAME: string;
-    DOCKER_IMAGE: string;
+  DOCKER_IMAGE_TAG: import("..").BashExpression;
+  DOCKER_REGISTRY: import("..").BashExpression;
+  DOCKER_CACHE_IMAGE: string;
+  DOCKER_IMAGE_NAME: string;
+  DOCKER_IMAGE: string;
 };
 /**
  * Weather the context requires a docker build
  */
 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;
+export declare const getDockerBuildVariables: (context: ComponentContextWithBuild) => {
+  DOCKER_IMAGE_TAG: import("..").BashExpression;
+  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_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: import("..").BashExpression;
+  DOCKER_REGISTRY: import("..").BashExpression;
+  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_REGISTRY: string;
-    DOCKER_IMAGE: import("..").StringOrBashExpression;
-    DOCKER_CACHE_IMAGE: string;
-    APP_DIR: string;
-    DOCKER_BUILD_CONTEXT: string;
-    DOCKERFILE_ADDITIONS: string;
-    DOCKERFILE_ADDITIONS_END: string;
+  DOCKER_IMAGE_TAG: import("..").BashExpression;
+  DOCKER_REGISTRY: string;
+  DOCKER_IMAGE: import("..").StringOrBashExpression;
+  DOCKER_CACHE_IMAGE: string;
+  APP_DIR: string;
+  DOCKER_BUILD_CONTEXT: string;
+  DOCKERFILE_ADDITIONS: string;
+  DOCKERFILE_ADDITIONS_END: string;
 } | {
-    DOCKER_IMAGE_TAG: string;
-    DOCKER_REGISTRY: string;
-    DOCKER_CACHE_IMAGE: string;
-    DOCKER_IMAGE_NAME: string;
-    DOCKER_IMAGE: string;
-    APP_DIR: string;
-    DOCKER_BUILD_CONTEXT: string;
-    DOCKERFILE_ADDITIONS: string;
-    DOCKERFILE_ADDITIONS_END: string;
+  DOCKER_IMAGE_TAG: import("..").BashExpression;
+  DOCKER_REGISTRY: import("..").BashExpression;
+  DOCKER_CACHE_IMAGE: string;
+  DOCKER_IMAGE_NAME: string;
+  DOCKER_IMAGE: string;
+  APP_DIR: string;
+  DOCKER_BUILD_CONTEXT: string;
+  DOCKERFILE_ADDITIONS: string;
+  DOCKERFILE_ADDITIONS_END: string;
 };
 export declare const DOCKER_BUILD_JOB_NAME = "\uD83D\uDD28 docker";
 export declare const getDockerJobBaseProps: () => Pick<CatladderJob, "image" | "services" | "variables" | "runnerVariables">;
-export declare const createDockerBuildJobBase: (context: ComponentContext, { script, cache, ...def }: DockerBuildJobDefinition) => CatladderJob;
+export declare class DockerBuildJob extends CatladderJob {
+  constructor(context: ComponentContextWithBuild, {
+    script,
+    cache,
+    variables,
+    runnerVariables,
+    ...def
+  }: DockerBuildJobDefinition);
+}
 export declare const gitlabDockerLogin: (context: ComponentContext) => string[];
-export declare const getDockerBuildScriptWithBuiltInDockerFile: (context: ComponentContext, defaultType?: BuildConfigDocker["type"]) => string[];
+export declare const getDockerBuildScriptWithBuiltInDockerFile: (context: ComponentContextWithBuild, fallbackType?: BuildConfigDocker["type"]) => string[];
 export declare const getDockerBuildDefaultScript: (context: ComponentContext, ensureDockerFileScript?: string | null) => string[];
-export declare const hasDockerfile: (context: ComponentContext) => boolean;
+export declare const hasDockerfile: (context: ComponentContext) => boolean;

package/dist/pipeline/src/build/docker.js

@@ -1,162 +1,166 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+
+var __importDefault = this && this.__importDefault || function (mod) {
+  return mod && mod.__esModule ? mod : {
+    "default": mod
+  };
 };
-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;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.hasDockerfile = exports.getDockerBuildDefaultScript = exports.getDockerBuildScriptWithBuiltInDockerFile = exports.gitlabDockerLogin = exports.DockerBuildJob = exports.getDockerJobBaseProps = exports.DOCKER_BUILD_JOB_NAME = exports.getDockerBuildVariables = exports.requiresDockerBuild = exports.getDockerImageVariables = void 0;
 const fs_1 = require("fs");
-const lodash_1 = require("lodash");
+const lodash_es_1 = require("lodash-es");
 const path_1 = __importDefault(require("path"));
 const deploy_1 = require("../deploy");
 const artifactsRegistry_1 = require("../deploy/cloudRun/artifactsRegistry");
 const gcloudServiceAccountLoginCommands_1 = require("../deploy/cloudRun/utils/gcloudServiceAccountLoginCommands");
+const ciVariables_1 = require("../bash/ciVariables");
 const runner_1 = require("../runner");
+const jobs_1 = require("../types/jobs");
 const gitlab_1 = require("../utils/gitlab");
-const createJobCache_1 = require("./cache/createJobCache");
+const removeUndefined_1 = require("../utils/removeUndefined");
 const DOCKER_BUILD_RUNNER_REQUESTS = {
-    KUBERNETES_CPU_REQUEST: "0.45",
-    KUBERNETES_MEMORY_REQUEST: "1Gi",
-    KUBERNETES_MEMORY_LIMIT: "2Gi",
+  KUBERNETES_CPU_REQUEST: "0.45",
+  KUBERNETES_MEMORY_REQUEST: "1Gi",
+  KUBERNETES_MEMORY_LIMIT: "2Gi"
 };
-const getDockerImageVariables = (context) => {
-    var _a;
-    const deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
-    return {
-        ...((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_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",
-    };
+const getDockerImageVariables = context => {
+  var _a;
+  const deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
+  return {
+    ...((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)
+    } :
+    // the registry of the CI system (e.g. the gitlab registry):
+    {
+      DOCKER_REGISTRY: (0, ciVariables_1.getCiVariable)(context, "registry"),
+      DOCKER_CACHE_IMAGE: `${(0, ciVariables_1.getCiVariable)(context, "registryImage")}/caches/${context.name}`,
+      // ONLY USED IN KUBERNETES
+      DOCKER_IMAGE_NAME: context.env + "/" + context.name,
+      DOCKER_IMAGE: `${(0, ciVariables_1.getCiVariable)(context, "registryImage")}/$DOCKER_IMAGE_NAME`
+    }),
+    DOCKER_IMAGE_TAG: (0, ciVariables_1.getCiVariable)(context, "commitSha")
+  };
 };
 exports.getDockerImageVariables = getDockerImageVariables;
 /**
  * Weather the context requires a docker build
  */
-const requiresDockerBuild = (context) => {
-    var _a;
-    const 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));
+const requiresDockerBuild = context => {
+  var _a;
+  const 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;
 // those need to be runner variables
 const getDockerBuildRunnerVariables = () => ({
-    DOCKER_HOST: "tcp://0.0.0.0:2375",
-    DOCKER_TLS_CERTDIR: "",
-    DOCKER_DRIVER: "overlay2",
-    DOCKER_BUILDKIT: "1", // see https://docs.docker.com/develop/develop-images/build_enhancements/
+  DOCKER_HOST: "tcp://docker:2375",
+  DOCKER_TLS_CERTDIR: "",
+  DOCKER_DRIVER: "overlay2",
+  DOCKER_BUILDKIT: "1" // see https://docs.docker.com/develop/develop-images/build_enhancements/
 });
-const getDockerAdditions = (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,
-    };
+const getDockerAdditions = 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
+  };
 };
-const getDockerBuildVariables = (context) => {
-    var _a;
-    return {
-        ...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),
-    };
+const getDockerBuildVariables = context => {
+  var _a;
+  return {
+    ...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";
 const getDockerJobBaseProps = () => {
-    return {
-        image: (0, runner_1.getRunnerImage)("docker-build"),
-        services: [
-            {
-                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: {},
-        runnerVariables: getDockerBuildRunnerVariables(),
-    };
+  return {
+    image: (0, runner_1.getRunnerImage)("docker-build"),
+    services: [{
+      name: "docker:29.5.1-dind",
+      // see see https://gitlab.com/gitlab-org/gitlab-runner/-/issues/27300#note_466755332
+      command: ["--tls=false", "--registry-mirror=https://mirror.gcr.io"]
+    }],
+    variables: {},
+    runnerVariables: getDockerBuildRunnerVariables()
+  };
 };
 exports.getDockerJobBaseProps = getDockerJobBaseProps;
-const createDockerBuildJobBase = (context, { script, cache, ...def }) => {
-    return (0, lodash_1.merge)({
-        name: exports.DOCKER_BUILD_JOB_NAME,
-        envMode: "jobPerEnv",
-        stage: "build",
-        cache: cache ? (0, createJobCache_1.createJobCacheFromCacheConfigs)(context, cache) : undefined,
-        ...(0, exports.getDockerJobBaseProps)(),
-        script: script || [],
-    }, {
-        variables: (0, exports.getDockerBuildVariables)(context),
-        runnerVariables: {
-            ...DOCKER_BUILD_RUNNER_REQUESTS,
-            ...getDockerBuildRunnerVariables(),
-        },
-    }, def);
-};
-exports.createDockerBuildJobBase = createDockerBuildJobBase;
-const gitlabDockerLogin = (context) => context.deploy && (0, deploy_1.isOfDeployType)(context.deploy.config, "google-cloudrun")
-    ? [
-        ...(0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context),
-        `gcloud auth configure-docker ${(0, artifactsRegistry_1.getArtifactsRegistryHost)(context)}`,
-    ]
-    : [
-        "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
-    ];
+class DockerBuildJob extends jobs_1.CatladderJob {
+  constructor(context, {
+    script,
+    cache,
+    variables,
+    runnerVariables,
+    ...def
+  }) {
+    super({
+      name: exports.DOCKER_BUILD_JOB_NAME,
+      envMode: "jobPerEnv",
+      stage: "build",
+      provides: ["dockerImage"],
+      caches: cache,
+      ...(0, exports.getDockerJobBaseProps)(),
+      script: script || [],
+      variables: {
+        ...(0, removeUndefined_1.removeUndefined)((0, exports.getDockerBuildVariables)(context)),
+        ...(0, removeUndefined_1.removeUndefined)(variables !== null && variables !== void 0 ? variables : {})
+      },
+      runnerVariables: {
+        ...getDockerBuildRunnerVariables(),
+        ...DOCKER_BUILD_RUNNER_REQUESTS,
+        ...(0, removeUndefined_1.removeUndefined)(runnerVariables !== null && runnerVariables !== void 0 ? runnerVariables : {})
+      },
+      // definition overrides the defaults above; undefined values are
+      // skipped and objects cloned to keep the previous lodash `merge`
+      // semantics (cloning avoids shared references, which would show up
+      // as anchors/aliases in the generated yaml)
+      ...(0, lodash_es_1.cloneDeep)((0, removeUndefined_1.removeUndefined)(def))
+    });
+  }
+}
+exports.DockerBuildJob = DockerBuildJob;
+const gitlabDockerLogin = context => context.deploy && (0, deploy_1.isOfDeployType)(context.deploy.config, "google-cloudrun") ? [...(0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context), `gcloud auth configure-docker ${(0, artifactsRegistry_1.getArtifactsRegistryHost)(context)}`] : [`docker login --username gitlab-ci-token --password ${(0, ciVariables_1.getCiVariable)(context, "jobToken")} ${(0, ciVariables_1.getCiVariable)(context, "registry")}`];
 exports.gitlabDockerLogin = gitlabDockerLogin;
 const BUILT_IN_ENSURE_DOCKERFILE_SCRIPTS = {
-    meteor: "ensureMeteorDockerfile",
-    node: "ensureNodeDockerfile",
-    nginx: "ensureNginxDockerfile",
-    custom: null,
+  meteor: "ensureMeteorDockerfile",
+  node: "ensureNodeDockerfile",
+  nginx: "ensureNginxDockerfile",
+  custom: null
+};
+const getEnsureDockerFileScript = (context, fallbackType) => {
+  var _a, _b, _c, _d, _e, _f;
+  if ("docker" in context.build.config && context.build.config.docker && "type" in context.build.config.docker) {
+    if (((_a = context.build.config.docker) === null || _a === void 0 ? void 0 : _a.type) === "custom") {
+      if ((_b = context.build.config.docker) === null || _b === void 0 ? void 0 : _b.dockerfileContent) {
+        // we need to create a script that creates a Dockerfile in the current directory
+        return `
+echo "Creating Dockerfile"
+cat >$APP_DIR/Dockerfile <<EOF
+${(_d = (_c = context.build.config.docker) === null || _c === void 0 ? void 0 : _c.dockerfileContent) === null || _d === void 0 ? void 0 : _d.join("\n")}
+EOF`;
+      }
+    }
+    const type = (_f = (_e = context.build.config.docker) === null || _e === void 0 ? void 0 : _e.type) !== null && _f !== void 0 ? _f : fallbackType;
+    return type ? BUILT_IN_ENSURE_DOCKERFILE_SCRIPTS[type] : null;
+  }
+  return fallbackType ? BUILT_IN_ENSURE_DOCKERFILE_SCRIPTS[fallbackType] : null;
 };
-const getDockerBuildScriptWithBuiltInDockerFile = (context, defaultType) => {
-    var _a;
-    const 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);
+const getDockerBuildScriptWithBuiltInDockerFile = (context, fallbackType) => {
+  return (0, exports.getDockerBuildDefaultScript)(context, getEnsureDockerFileScript(context, fallbackType));
 };
 exports.getDockerBuildScriptWithBuiltInDockerFile = getDockerBuildScriptWithBuiltInDockerFile;
-const getDockerBuildDefaultScript = (context, ensureDockerFileScript) => [
-    ensureDockerFileScript !== null && ensureDockerFileScript !== void 0 ? ensureDockerFileScript : undefined,
-    ...(0, gitlab_1.collapseableSection)("docker-login", "Docker Login")((0, exports.gitlabDockerLogin)(context)),
-    ...(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/
-    ]),
-    ...(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",
-    ]),
-].filter(Boolean);
+const getDockerBuildDefaultScript = (context, ensureDockerFileScript) => [ensureDockerFileScript !== null && ensureDockerFileScript !== void 0 ? ensureDockerFileScript : undefined, ...(0, gitlab_1.collapseableSection)("docker-login", "Docker Login")((0, exports.gitlabDockerLogin)(context)), ...(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/
+]), ...(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"])].filter(Boolean);
 exports.getDockerBuildDefaultScript = getDockerBuildDefaultScript;
-const hasDockerfile = (context) => (0, fs_1.existsSync)(path_1.default.join(context.build.dir, "Dockerfile"));
-exports.hasDockerfile = hasDockerfile;
-//# sourceMappingURL=docker.js.map
+const hasDockerfile = context => (0, fs_1.existsSync)(path_1.default.join(context.build.dir, "Dockerfile"));
+exports.hasDockerfile = hasDockerfile;