@catladder/pipeline 1.146.1 → 1.147.0

package/dist/build/base/createAppBuildJob.d.ts

@@ -1,7 +1,7 @@
-import type { Context } from "../..";
+import type { ComponentContext } from "../..";
 import type { CatladderJob } from "../../types/jobs";
 export type AppBuildJobDefinition = Partial<CatladderJob>;
-export declare const createAppBuildJob: (context: Context, {
+export declare const createAppBuildJob: (context: ComponentContext, {
   script,
   variables,
   runnerVariables,

package/dist/build/base/createAppBuildJob.js

@@ -74,15 +74,15 @@ var createAppBuildJob = function (context, _a) {
     image: (0, __1.getRunnerImage)("jobs-default"),
     needs: [],
     cache: [],
-    variables: __assign(__assign(__assign(__assign({}, variables !== null && variables !== void 0 ? variables : {}), context.environment.envVars), context.environment.jobOnlyVars.build.envVars), (_b = context.componentConfig.build.extraVars) !== null && _b !== void 0 ? _b : {}),
-    runnerVariables: __assign(__assign(__assign({}, constants_1.RUNNER_BUILD_RESOURCE_VARIABLES), runnerVariables !== null && runnerVariables !== void 0 ? runnerVariables : {}), (_c = context.componentConfig.build.runnerVariables) !== null && _c !== void 0 ? _c : {}),
+    variables: __assign(__assign(__assign(__assign({}, variables !== null && variables !== void 0 ? variables : {}), context.environment.envVars), context.environment.jobOnlyVars.build.envVars), (_b = context.build.config.extraVars) !== null && _b !== void 0 ? _b : {}),
+    runnerVariables: __assign(__assign(__assign({}, constants_1.RUNNER_BUILD_RESOURCE_VARIABLES), runnerVariables !== null && runnerVariables !== void 0 ? runnerVariables : {}), (_c = context.build.config.runnerVariables) !== null && _c !== void 0 ? _c : {}),
     script: __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(context.componentConfig.dotEnv === true // don't build when set to `local`
-    ? (0, writeDotEnv_1.writeDotEnv)(context) : []), false), __read((0, writeBuildInfo_1.writeBuildInfo)(context)), false), __read((0, yarn_1.ensureNodeVersion)(context)), false), ["cd ".concat(context.componentConfig.dir)], false), __read((_d = (0, utils_1.ensureArray)(script)) !== null && _d !== void 0 ? _d : []), false),
+    ? (0, writeDotEnv_1.writeDotEnv)(context) : []), false), __read((0, writeBuildInfo_1.writeBuildInfo)(context)), false), __read((0, yarn_1.ensureNodeVersion)(context.build)), false), ["cd ".concat(context.build.dir)], false), __read((_d = (0, utils_1.ensureArray)(script)) !== null && _d !== void 0 ? _d : []), false),
     artifacts: {
-      paths: [(0, path_1.join)(context.componentConfig.dir, "__build_info.json")],
+      paths: [(0, path_1.join)(context.build.dir, "__build_info.json")],
       reports: {
-        junit: (_f = (_e = context.componentConfig.build.artifactsReports) === null || _e === void 0 ? void 0 : _e.junit) === null || _f === void 0 ? void 0 : _f.map(function (p) {
-          return (0, path_1.join)(context.componentConfig.dir, p);
+        junit: (_f = (_e = context.build.config.artifactsReports) === null || _e === void 0 ? void 0 : _e.junit) === null || _f === void 0 ? void 0 : _f.map(function (p) {
+          return (0, path_1.join)(context.build.dir, p);
         })
       }
     }

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

@@ -1,8 +1,8 @@
-import type { Context } from "../../types/context";
+import type { ComponentContext } from "../../types/context";
 import type { CatladderJob } from "../../types/jobs";
 import type { DockerBuildJobDefinition } from "../docker";
 import type { AppBuildJobDefinition } from "./createAppBuildJob";
-export declare const createBuildJobs: (context: Context, definitions: {
+export declare const createBuildJobs: (context: ComponentContext, definitions: {
   appBuild?: AppBuildJobDefinition;
   dockerBuild: DockerBuildJobDefinition;
 }) => CatladderJob[];

package/dist/build/base/writeBuildInfo.d.ts

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

package/dist/build/base/writeBuildInfo.js

@@ -5,6 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.writeBuildInfo = void 0;
 var writeBuildInfo = function (context) {
-  return ["echo '{\"id\":\"".concat(context.environment.envVars.BUILD_INFO_BUILD_ID, "\",\"time\":\"").concat(context.environment.envVars.BUILD_INFO_BUILD_TIME, "\"}' > ").concat(context.componentConfig.dir, "/__build_info.json")];
+  return ["echo '{\"id\":\"".concat(context.environment.envVars.BUILD_INFO_BUILD_ID, "\",\"time\":\"").concat(context.environment.envVars.BUILD_INFO_BUILD_TIME, "\"}' > ").concat(context.build.dir, "/__build_info.json")];
 };
 exports.writeBuildInfo = writeBuildInfo;

package/dist/build/base/writeDotEnv.d.ts

@@ -1,7 +1,7 @@
-import type { Context } from "../../types";
+import type { ComponentContext } from "../../types";
 /**
  * writes a .env file in the components folder
  * @param context
  * @returns
  */
-export declare const writeDotEnv: (context: Context) => string[];
+export declare const writeDotEnv: (context: ComponentContext) => string[];

package/dist/build/base/writeDotEnv.js

@@ -47,6 +47,6 @@ var writeDotEnv = function (context) {
       value = _b[1];
     return "".concat(key, "=").concat(value === null || value === void 0 ? void 0 : value.toString().replaceAll("\n", "\\n"));
   }).join("\n");
-  return ["cat <<EOF > ".concat(context.componentConfig.dir, "/.env\n").concat(keyValueString, "\nEOF")];
+  return ["cat <<EOF > ".concat(context.build.dir, "/.env\n").concat(keyValueString, "\nEOF")];
 };
 exports.writeDotEnv = writeDotEnv;

package/dist/build/custom/__tests__/testJob.test.js

@@ -5,17 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 var testJob_1 = require("../testJob");
 describe("createCustomTestJobs", function () {
-  var componentConfig = {
-    dir: ".",
-    build: {
-      type: "custom",
-      docker: {
-        type: "custom"
-      },
-      jobImage: ""
-    },
-    deploy: {}
-  };
   var baseContext = {
     componentName: "testComponent",
     environment: {
@@ -23,14 +12,22 @@ describe("createCustomTestJobs", function () {
         build: {}
       }
     },
-    componentConfig: componentConfig
+    build: {
+      config: {
+        type: "custom",
+        docker: {
+          type: "custom"
+        },
+        jobImage: ""
+      }
+    }
   };
   it("throws error when not build type custom", function () {
-    componentConfig.build.type = "node";
+    baseContext.build.config.type = "node";
     expect(function () {
       return (0, testJob_1.createCustomTestJobs)(baseContext);
     }).toThrowError("deploy config is not custom");
-    componentConfig.build.type = "custom";
+    baseContext.build.config.type = "custom";
   });
   it("returns empty array if no audit, lint, and test definition", function () {
     var jobs = (0, testJob_1.createCustomTestJobs)(baseContext);

package/dist/build/custom/buildJob.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 createCustomBuildJobs: (context: Context) => CatladderJob[];
+export declare const createCustomBuildJobs: (context: ComponentContext) => CatladderJob[];

package/dist/build/custom/buildJob.js

@@ -46,8 +46,8 @@ var RUNNER_BUILD_VARIABLES = {
   KUBERNETES_MEMORY_LIMIT: "4Gi"
 };
 var createCustomBuildJobs = function (context) {
-  var _a, _b, _c, _d;
-  var buildConfig = context.componentConfig.build;
+  var _a, _b, _c;
+  var buildConfig = context.build.config;
   if (!(0, types_1.isOfBuildType)(buildConfig, "custom")) {
     throw new Error("deploy config is not custom");
   }
@@ -59,14 +59,14 @@ var createCustomBuildJobs = function (context) {
       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);
+        paths: __spreadArray([(0, path_1.join)(context.build.dir, "__build_info.json"), (0, path_1.join)(context.build.dir, "dist")], __read((_c = (_b = buildConfig.artifactsPaths) === null || _b === void 0 ? void 0 : _b.map(function (path) {
+          return (0, path_1.join)(context.build.dir, path);
         })) !== null && _c !== void 0 ? _c : []), false),
         expire_in: "1 day"
       }
     } : undefined,
     dockerBuild: {
-      script: (0, docker_1.getDockerBuildDefaultScript)(context, ((_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/testJob.d.ts

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

package/dist/build/custom/testJob.js

@@ -60,13 +60,13 @@ var createCustomTestJobs = function (context) {
   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({
-      APP_PATH: context.componentConfig.dir
+      APP_PATH: context.build.dir
     }, context.environment.jobOnlyVars.build.envVars), (_a = buildConfig.extraVars) !== null && _a !== void 0 ? _a : {}),
     runnerVariables: RUNNER_CUSTOM_TEST_VARIABLES,
     services: buildConfig.jobServices,
@@ -82,19 +82,19 @@ var createCustomTestJobs = function (context) {
     cache: undefined,
     script: __spreadArray([], __read((_e = (0, utils_1.ensureArray)((_d = buildConfig.audit) === null || _d === void 0 ? void 0 : _d.command)) !== null && _e !== void 0 ? _e : []), false),
     allow_failure: true
-  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.componentConfig.dir, (_f = buildConfig.audit) === null || _f === void 0 ? void 0 : _f.artifactsReports, (_g = buildConfig.audit) === null || _g === void 0 ? void 0 : _g.artifacts)) : null;
+  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_f = buildConfig.audit) === null || _f === void 0 ? void 0 : _f.artifactsReports, (_g = buildConfig.audit) === null || _g === void 0 ? void 0 : _g.artifacts)) : null;
   var lintJob = buildConfig.lint ? __assign(__assign(__assign({
     name: "👮 lint"
   }, base), {
     image: (_j = (_h = buildConfig.lint) === null || _h === void 0 ? void 0 : _h.jobImage) !== null && _j !== void 0 ? _j : buildConfig.jobImage,
     script: __spreadArray([], __read((_l = (0, utils_1.ensureArray)((_k = buildConfig.lint) === null || _k === void 0 ? void 0 : _k.command)) !== null && _l !== void 0 ? _l : []), false)
-  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.componentConfig.dir, (_m = buildConfig.lint) === null || _m === void 0 ? void 0 : _m.artifactsReports, (_o = buildConfig.lint) === null || _o === void 0 ? void 0 : _o.artifacts)) : null;
+  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_m = buildConfig.lint) === null || _m === void 0 ? void 0 : _m.artifactsReports, (_o = buildConfig.lint) === null || _o === void 0 ? void 0 : _o.artifacts)) : null;
   var testJob = buildConfig.test ? __assign(__assign(__assign({
     name: "🧪 test"
   }, base), {
     image: (_q = (_p = buildConfig.test) === null || _p === void 0 ? void 0 : _p.jobImage) !== null && _q !== void 0 ? _q : buildConfig.jobImage,
     script: __spreadArray([], __read((_s = (0, utils_1.ensureArray)((_r = buildConfig.test) === null || _r === void 0 ? void 0 : _r.command)) !== null && _s !== void 0 ? _s : []), false)
-  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.componentConfig.dir, (_t = buildConfig.test) === null || _t === void 0 ? void 0 : _t.artifactsReports, (_u = buildConfig.test) === null || _u === void 0 ? void 0 : _u.artifacts)) : null;
+  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_t = buildConfig.test) === null || _t === void 0 ? void 0 : _t.artifactsReports, (_u = buildConfig.test) === null || _u === void 0 ? void 0 : _u.artifacts)) : null;
   return [auditJob, lintJob, testJob].filter(utils_1.notNil);
 };
 exports.createCustomTestJobs = createCustomTestJobs;

package/dist/build/docker.d.ts

@@ -1,6 +1,7 @@
-import type { Context } from "../types";
+import type { BuildConfigDocker } from ".";
+import type { ComponentContext } 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("../bash/BashExpression").StringOrBashExpression;
@@ -15,38 +16,54 @@ export declare const getDockerImageVariables: (context: Context) => {
 /**
  * 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("../bash/BashExpression").StringOrBashExpression;
   DOCKER_CACHE_IMAGE: string;
-  DOCKERFILE_ADDITIONS: string | undefined;
-  DOCKERFILE_ADDITIONS_END: string | undefined;
   APP_DIR: string;
   DOCKER_DIR: 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_DIR: string;
+  DOCKERFILE_ADDITIONS?: undefined;
+  DOCKERFILE_ADDITIONS_END?: undefined;
+} | {
+  DOCKER_IMAGE_TAG: string;
+  DOCKER_REGISTRY: string;
+  DOCKER_IMAGE: import("../bash/BashExpression").StringOrBashExpression;
+  DOCKER_CACHE_IMAGE: string;
+  APP_DIR: string;
+  DOCKER_DIR: 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;
+  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) => Pick<CatladderJob, "image" | "services" | "variables" | "runnerVariables">;
+export declare const getDockerJobBaseProps: () => Pick<CatladderJob, "image" | "services" | "variables" | "runnerVariables">;
 export type DockerBuildJobDefinition = Partial<CatladderJob>;
-export declare const createDockerBuildJobBase: (context: Context, {
+export declare const createDockerBuildJobBase: (context: ComponentContext, {
   script,
   ...def
 }: Partial<CatladderJob>) => CatladderJob;
-export declare const gitlabDockerLogin: (context: Context) => string[];
-export declare const getDockerBuildDefaultScript: (context: Context, ensureDockerFileScript?: string) => (string | undefined)[];
-export declare const hasDockerfile: (context: Context) => boolean;
+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

@@ -57,22 +57,24 @@ var __importDefault = this && this.__importDefault || function (mod) {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.hasDockerfile = exports.getDockerBuildDefaultScript = exports.gitlabDockerLogin = exports.createDockerBuildJobBase = exports.getDockerJobBaseProps = exports.DOCKER_BUILD_JOB_NAME = exports.getDockerBuildVariables = exports.requiresDockerBuild = exports.getDockerImageVariables = void 0;
-var lodash_1 = require("lodash");
-var deploy_1 = require("../deploy");
-var runner_1 = require("../runner");
+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 gitlab_1 = require("../utils/gitlab");
+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 gitlab_1 = require("../utils/gitlab");
 var DOCKER_BUILD_RUNNER_REQUESTS = {
   KUBERNETES_CPU_REQUEST: "0.5",
   KUBERNETES_MEMORY_REQUEST: "1Gi",
   KUBERNETES_MEMORY_LIMIT: "2Gi"
 };
 var getDockerImageVariables = function (context) {
-  return __assign(__assign({}, (0, deploy_1.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun") ? {
+  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)
@@ -92,9 +94,10 @@ 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;
 // those need to be runner variables
@@ -107,18 +110,24 @@ var getDockerBuildRunnerVariables = function () {
   };
 };
 
+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({
-    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,
+  return __assign(__assign(__assign({}, getDockerAdditions(context.build.config)), {
+    APP_DIR: context.build.dir,
     DOCKER_DIR: "."
-  }, (0, exports.getDockerImageVariables)(context));
+  }), (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: [{
@@ -138,7 +147,7 @@ var createDockerBuildJobBase = function (context, _a) {
     name: exports.DOCKER_BUILD_JOB_NAME,
     envMode: "jobPerEnv",
     stage: "build"
-  }, (0, exports.getDockerJobBaseProps)(context)), {
+  }, (0, exports.getDockerJobBaseProps)()), {
     script: script || []
   }), {
     variables: (0, exports.getDockerBuildVariables)(context),
@@ -147,15 +156,27 @@ var createDockerBuildJobBase = function (context, _a) {
 };
 exports.createDockerBuildJobBase = createDockerBuildJobBase;
 var gitlabDockerLogin = function (context) {
-  return (0, deploy_1.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun") ? __spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), ["gcloud auth configure-docker ".concat((0, artifactsRegistry_1.getArtifactsRegistryHost)(context))], false) : ["docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY"];
+  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.componentConfig.build && context.componentConfig.build.docker && "type" in context.componentConfig.build.docker ? (_a = context.componentConfig.build.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], __read((0, gitlab_1.collapseableSection)("docker-login", "Docker Login")((0, exports.gitlabDockerLogin)(context))), false), __read((0, gitlab_1.collapseableSection)("docker-build", "Docker build")(["docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile . --build-arg BUILDKIT_INLINE_CACHE=1" //BUILDKIT_INLINE_CACHE,  see https://testdriven.io/blog/faster-ci-builds-with-docker-cache/
+  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 . --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,11 +1,11 @@
-import type { Context } from "../types/context";
+import type { ComponentContext } from "../types/context";
 import type { EnvironmentContext } from "../types/environmentContext";
 import type { CatladderJob } from "../types/jobs";
 import type { BuildConfig, BuildConfigType } from "./types";
 export * from "./types";
 export * from "./node";
 export type BuildTypes = { [type in BuildConfigType]: {
-  jobs: (context: Context) => CatladderJob[];
+  jobs: (context: ComponentContext) => CatladderJob[];
   defaults: (envContext: EnvironmentContext<BuildConfigType, any>) => Partial<Extract<BuildConfig, {
     type: type;
   }>>;

package/dist/build/node/buildJob.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 createNodeBuildJobs: (context: Context) => CatladderJob[];
+export declare const createNodeBuildJobs: (context: ComponentContext) => CatladderJob[];

package/dist/build/node/buildJob.js

@@ -46,20 +46,20 @@ var constants_1 = require("./constants");
 var yarn_1 = require("./yarn");
 var createNodeBuildJobs = function (context) {
   var _a, _b, _c, _d, _e, _f, _g;
-  var buildConfig = context.componentConfig.build;
+  var buildConfig = context.build.config;
   if (!(0, types_1.isOfBuildType)(buildConfig, "node", "node-static", "storybook")) {
     throw new Error("deploy config is not node, node-static or storybook");
   }
   var defaultImage = (0, runner_1.getRunnerImage)("jobs-default");
-  var yarnInstall = (0, yarn_1.getYarnInstall)(context);
+  var yarnInstall = (0, yarn_1.getYarnInstall)(context.build);
   return (0, base_1.createBuildJobs)(context, {
     appBuild: buildConfig.buildCommand !== null ? {
       image: (_a = buildConfig.jobImage) !== null && _a !== void 0 ? _a : defaultImage,
       runnerVariables: constants_1.NODE_RUNNER_BUILD_VARIABLES,
-      cache: __spreadArray(__spreadArray(__spreadArray([], __read((_b = (0, utils_1.ensureArray)(buildConfig.jobCache)) !== null && _b !== void 0 ? _b : []), false), __read((0, cache_1.getNodeCache)(context)), false), __read((0, cache_1.getNextCache)(context)), false),
+      cache: __spreadArray(__spreadArray(__spreadArray([], __read((_b = (0, utils_1.ensureArray)(buildConfig.jobCache)) !== null && _b !== void 0 ? _b : []), false), __read((0, cache_1.getNodeCache)(context.build)), false), __read((0, cache_1.getNextCache)(context)), false),
       script: __spreadArray(__spreadArray([], __read(yarnInstall), false), __read((_c = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _c !== void 0 ? _c : []), false),
       artifacts: {
-        paths: __spreadArray([context.componentConfig.dir], __read((_e = (_d = context.packageManagerInfo) === null || _d === void 0 ? void 0 : _d.currentWorkspaceDependencies) !== null && _e !== void 0 ? _e : []), false).flatMap(function (dir) {
+        paths: __spreadArray([context.build.dir], __read((_e = (_d = context.build.packageManagerInfo) === null || _d === void 0 ? void 0 : _d.currentWorkspaceDependencies) !== null && _e !== void 0 ? _e : []), false).flatMap(function (dir) {
           var _a, _b;
           return __spreadArray([(0, path_1.join)(dir, "__build_info.json"), (0, path_1.join)(dir, "dist"), (0, path_1.join)(dir, ".next")], __read((_b = (_a = buildConfig.artifactsPaths) === null || _a === void 0 ? void 0 : _a.map(function (path) {
             return (0, path_1.join)(dir, path);
@@ -71,12 +71,12 @@ var createNodeBuildJobs = function (context) {
       jobTags: buildConfig.jobTags
     } : undefined,
     dockerBuild: {
-      script: (0, docker_1.getDockerBuildDefaultScript)(context, buildConfig.type === "node-static" || buildConfig.type === "storybook" ? "ensureNginxDockerfile" : "ensureNodeDockerfile"),
-      cache: __spreadArray([], __read((0, cache_1.getYarnCache)(context, "pull")), false),
+      script: (0, docker_1.getDockerBuildScriptWithBuiltInDockerFile)(context, buildConfig.type === "node-static" || buildConfig.type === "storybook" ? "nginx" : "node"),
+      cache: __spreadArray([], __read((0, cache_1.getYarnCache)(context.build, "pull")), false),
       variables: {
         // only required for non static
-        DOCKER_COPY_AND_INSTALL_APP: (0, yarn_1.getDockerAppCopyAndBuildScript)(context),
-        DOCKER_COPY_WORKSPACE_FILES: (_g = (_f = context.packageManagerInfo) === null || _f === void 0 ? void 0 : _f.pathsToCopyInDocker.map(function (dir) {
+        DOCKER_COPY_AND_INSTALL_APP: (0, yarn_1.getDockerAppCopyAndBuildScript)(context.build),
+        DOCKER_COPY_WORKSPACE_FILES: (_g = (_f = context.build.packageManagerInfo) === null || _f === void 0 ? void 0 : _f.pathsToCopyInDocker.map(function (dir) {
           return "COPY --chown=node:node ".concat(dir, " /app/").concat(dir);
         })) === null || _g === void 0 ? void 0 : _g.join("\n")
       }

package/dist/build/node/cache.d.ts

@@ -1,6 +1,6 @@
-import type { Context } from "../../types/context";
+import type { BuildContext, ComponentContext } from "../../types/context";
 import type { GitlabJobCache } from "../../types/gitlab-types";
-export declare const getYarnCache: (context: Context, policy?: string) => GitlabJobCache[];
-export declare const getNodeModulesCache: (context: Context, policy?: string) => GitlabJobCache[];
-export declare const getNodeCache: (context: Context, policy?: string) => GitlabJobCache[];
-export declare const getNextCache: (context: Context) => GitlabJobCache[];
+export declare const getYarnCache: (context: BuildContext, policy?: string) => GitlabJobCache[];
+export declare const getNodeModulesCache: (context: BuildContext, policy?: string) => GitlabJobCache[];
+export declare const getNodeCache: (context: BuildContext, policy?: string) => GitlabJobCache[];
+export declare const getNextCache: (context: ComponentContext) => GitlabJobCache[];

package/dist/build/node/cache.js

@@ -54,9 +54,9 @@ var getYarnCache = function (context, policy) {
     policy: policy,
     paths: [".yarn"]
   } : {
-    key: (0, slugify_1.default)(context.componentConfig.dir) + "-yarn",
+    key: (0, slugify_1.default)(context.dir) + "-yarn",
     policy: policy,
-    paths: [(0, path_1.join)(context.componentConfig.dir, ".yarn")]
+    paths: [(0, path_1.join)(context.dir, ".yarn")]
   }];
 };
 exports.getYarnCache = getYarnCache;
@@ -70,12 +70,12 @@ var getNodeModulesCache = function (context, policy) {
   // It would slow down all pipelines whenever one adds a new dependency as it will need to download all node_modules again.
   return [{
     // if component is in a shared workspace, use workspace cache. use individual cache else
-    key: componentIsInWorkspace ? "node-modules-workspace" : (0, slugify_1.default)(context.componentConfig.dir) + "-node-modules",
+    key: componentIsInWorkspace ? "node-modules-workspace" : (0, slugify_1.default)(context.dir) + "-node-modules",
     // we use the dirname, not the component name, because in certain cases we have two apps in the same directory and want to share the cache, e.g. when having storybook in the same package.json
     policy: policy,
     paths: __spreadArray([], __read(componentIsInWorkspace ? (0, lodash_1.uniq)(__spreadArray(["node_modules"], __read((_c = (_b = context.packageManagerInfo) === null || _b === void 0 ? void 0 : _b.workspaces.map(function (w) {
       return (0, path_1.join)(w.location, "node_modules");
-    })) !== null && _c !== void 0 ? _c : []), false)) : [(0, path_1.join)(context.componentConfig.dir, "node_modules")]), false)
+    })) !== null && _c !== void 0 ? _c : []), false)) : [(0, path_1.join)(context.dir, "node_modules")]), false)
   }];
 };
 exports.getNodeModulesCache = getNodeModulesCache;
@@ -90,7 +90,7 @@ var getNextCache = function (context) {
   return [{
     key: context.componentName + "-next-cache",
     policy: "pull-push",
-    paths: [context.componentConfig.dir + "/.next/cache/"]
+    paths: [context.build.dir + "/.next/cache/"]
   }];
 };
 exports.getNextCache = getNextCache;

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

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

package/dist/build/node/meteor.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 createMeteorBuildJobs: (context: Context) => CatladderJob[];
+export declare const createMeteorBuildJobs: (context: ComponentContext) => CatladderJob[];

package/dist/build/node/meteor.js

@@ -46,18 +46,18 @@ var getMeteorCache = function (context) {
   return [{
     key: context.componentName + "meteor-build-cache",
     policy: "pull-push",
-    paths: [(0, path_1.join)(context.componentConfig.dir, ".meteor/local/resolver-result-cache.json"), (0, path_1.join)(context.componentConfig.dir, ".meteor/local/plugin-cache"), (0, path_1.join)(context.componentConfig.dir, ".meteor/local/isopacks"), (0, path_1.join)(context.componentConfig.dir, ".meteor/local/bundler-cache/scanner")]
+    paths: [(0, path_1.join)(context.build.dir, ".meteor/local/resolver-result-cache.json"), (0, path_1.join)(context.build.dir, ".meteor/local/plugin-cache"), (0, path_1.join)(context.build.dir, ".meteor/local/isopacks"), (0, path_1.join)(context.build.dir, ".meteor/local/bundler-cache/scanner")]
   }];
 };
 var createMeteorBuildJobs = function (context) {
-  var buildConfig = context.componentConfig.build;
+  var buildConfig = context.build.config;
   if (!(0, types_1.isOfBuildType)(buildConfig, "meteor")) {
     throw new Error("deploy config is not meteor");
   }
-  var yarnInstall = (0, yarn_1.getYarnInstall)(context);
+  var yarnInstall = (0, yarn_1.getYarnInstall)(context.build);
   return (0, base_1.createBuildJobs)(context, {
     appBuild: buildConfig.buildCommand !== null ? {
-      cache: __spreadArray(__spreadArray([], __read((0, cache_1.getNodeCache)(context)), false), __read(getMeteorCache(context)), false),
+      cache: __spreadArray(__spreadArray([], __read((0, cache_1.getNodeCache)(context.build)), false), __read(getMeteorCache(context)), false),
       image: (0, runner_1.getRunnerImage)("jobs-meteor"),
       variables: {
         METEOR_DISABLE_OPTIMISTIC_CACHING: "1" // see https://forums.meteor.com/t/veeery-long-building-time-inside-docker-container/58673/17?u=macrozone
@@ -65,11 +65,11 @@ var createMeteorBuildJobs = function (context) {
 
       script: __spreadArray(__spreadArray([], __read(yarnInstall), false), ['echo "add healthcheck package"', "meteor add panter:healthroute --allow-superuser", "meteor add qualia:prod-shell --allow-superuser", 'TOOL_NODE_FLAGS="--max_old_space_size=3584 --min_semi_space_size=8 --max_semi_space_size=256 --optimize_for_size" meteor build ./dist --architecture os.linux.x86_64 --allow-superuser --server-only --directory', "cp ./__build_info.json ./dist/bundle/programs/server"], false),
       artifacts: {
-        paths: [context.componentConfig.dir + "/__build_info.json", context.componentConfig.dir + "/dist"]
+        paths: [context.build.dir + "/__build_info.json", context.build.dir + "/dist"]
       }
     } : undefined,
     dockerBuild: {
-      script: (0, docker_1.getDockerBuildDefaultScript)(context, "ensureMeteorDockerfile"),
+      script: (0, docker_1.getDockerBuildScriptWithBuiltInDockerFile)(context, "meteor"),
       variables: {
         METEOR_INSTALL_SCRIPTS: buildConfig.installScripts ? "true" : ""
       }

package/dist/build/node/testJob.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 createNodeTestJobs: (context: Context) => CatladderJob[];
+export declare const createNodeTestJobs: (context: ComponentContext) => CatladderJob[];