@catladder/cli 0.0.0-main-45f6e733 → 0.0.0-main-46c5c159

package/dist/bundles/catenv/index.js

@@ -2530,7 +2530,7 @@ var RUNNER_BUILD_VARIABLES = {
     KUBERNETES_MEMORY_LIMIT: "4Gi",
 };
 var createCustomBuildJobs = function (context) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     var buildConfig = context.build.config;
     if (!(0, types_1.isOfBuildType)(buildConfig, "custom")) {
         throw new Error("deploy config is not custom");
@@ -2555,7 +2555,7 @@ var createCustomBuildJobs = function (context) {
             }
             : undefined,
         dockerBuild: {
-            script: (0, docker_1.getDockerBuildScriptWithBuiltInDockerFile)(context),
+            script: (0, docker_1.getDockerBuildDefaultScript)(context, ((_d = buildConfig.docker) === null || _d === void 0 ? void 0 : _d.type) === "nginx" ? "ensureNginxDockerfile" : ""),
             variables: {},
         },
     });
@@ -2747,15 +2747,15 @@ 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;
-var fs_1 = __nccwpck_require__(7147);
+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 = __nccwpck_require__(3255);
-var path_1 = __importDefault(__nccwpck_require__(1017));
 var deploy_1 = __nccwpck_require__(8483);
-var artifactsRegistry_1 = __nccwpck_require__(4963);
-var gcloudServiceAccountLoginCommands_1 = __nccwpck_require__(6320);
 var runner_1 = __nccwpck_require__(4058);
+var fs_1 = __nccwpck_require__(7147);
+var path_1 = __importDefault(__nccwpck_require__(1017));
 var gitlab_1 = __nccwpck_require__(8490);
+var artifactsRegistry_1 = __nccwpck_require__(4963);
+var gcloudServiceAccountLoginCommands_1 = __nccwpck_require__(6320);
 var DOCKER_BUILD_RUNNER_REQUESTS = {
     KUBERNETES_CPU_REQUEST: "0.5",
     KUBERNETES_MEMORY_REQUEST: "1Gi",
@@ -2797,23 +2797,9 @@ var getDockerBuildRunnerVariables = function () { return ({
     DOCKER_DRIVER: "overlay2",
     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) {
-    return __assign(__assign(__assign({}, getDockerAdditions(context.build.config)), { APP_DIR: context.build.dir, DOCKER_DIR: "." }), (0, exports.getDockerImageVariables)(context));
+    var _a, _b, _c, _d;
+    return __assign({ DOCKERFILE_ADDITIONS: (_b = (_a = context.build.config.docker) === null || _a === void 0 ? void 0 : _a.additionsBegin) === null || _b === void 0 ? void 0 : _b.join("\n"), DOCKERFILE_ADDITIONS_END: (_d = (_c = context.build.config.docker) === null || _c === void 0 ? void 0 : _c.additionsEnd) === null || _d === void 0 ? void 0 : _d.join("\n"), APP_DIR: context.build.dir, DOCKER_DIR: "." }, (0, exports.getDockerImageVariables)(context));
 };
 exports.getDockerBuildVariables = getDockerBuildVariables;
 exports.DOCKER_BUILD_JOB_NAME = "🔨 docker";
@@ -2848,25 +2834,9 @@ var gitlabDockerLogin = function (context) {
     ];
 };
 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 !== null && ensureDockerFileScript !== void 0 ? ensureDockerFileScript : undefined
+        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/
     ])), false), __read((0, gitlab_1.collapseableSection)("docker-push", "Docker push and tag")([
@@ -3031,9 +3001,9 @@ var createNodeBuildJobs = function (context) {
             }
             : undefined,
         dockerBuild: {
-            script: (0, docker_1.getDockerBuildScriptWithBuiltInDockerFile)(context, buildConfig.type === "node-static" || buildConfig.type === "storybook"
-                ? "nginx"
-                : "node"),
+            script: (0, docker_1.getDockerBuildDefaultScript)(context, buildConfig.type === "node-static" || buildConfig.type === "storybook"
+                ? "ensureNginxDockerfile"
+                : "ensureNodeDockerfile"),
             cache: __spreadArray([], __read((0, cache_1.getYarnCache)(context.build, "pull")), false),
             variables: {
                 // only required for non static
@@ -3294,7 +3264,7 @@ var createMeteorBuildJobs = function (context) {
             }
             : undefined,
         dockerBuild: {
-            script: (0, docker_1.getDockerBuildScriptWithBuiltInDockerFile)(context, "meteor"),
+            script: (0, docker_1.getDockerBuildDefaultScript)(context, "ensureMeteorDockerfile"),
             variables: {
                 METEOR_INSTALL_SCRIPTS: buildConfig.installScripts ? "true" : "",
             },

package/dist/bundles/cli/index.js

@@ -9967,7 +9967,7 @@ var RUNNER_BUILD_VARIABLES = {
     KUBERNETES_MEMORY_LIMIT: "4Gi",
 };
 var createCustomBuildJobs = function (context) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     var buildConfig = context.build.config;
     if (!(0, types_1.isOfBuildType)(buildConfig, "custom")) {
         throw new Error("deploy config is not custom");
@@ -9992,7 +9992,7 @@ var createCustomBuildJobs = function (context) {
             }
             : undefined,
         dockerBuild: {
-            script: (0, docker_1.getDockerBuildScriptWithBuiltInDockerFile)(context),
+            script: (0, docker_1.getDockerBuildDefaultScript)(context, ((_d = buildConfig.docker) === null || _d === void 0 ? void 0 : _d.type) === "nginx" ? "ensureNginxDockerfile" : ""),
             variables: {},
         },
     });
@@ -10184,15 +10184,15 @@ 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;
-var fs_1 = __nccwpck_require__(57147);
+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 = __nccwpck_require__(23255);
-var path_1 = __importDefault(__nccwpck_require__(71017));
 var deploy_1 = __nccwpck_require__(68483);
-var artifactsRegistry_1 = __nccwpck_require__(44963);
-var gcloudServiceAccountLoginCommands_1 = __nccwpck_require__(46320);
 var runner_1 = __nccwpck_require__(4058);
+var fs_1 = __nccwpck_require__(57147);
+var path_1 = __importDefault(__nccwpck_require__(71017));
 var gitlab_1 = __nccwpck_require__(38490);
+var artifactsRegistry_1 = __nccwpck_require__(44963);
+var gcloudServiceAccountLoginCommands_1 = __nccwpck_require__(46320);
 var DOCKER_BUILD_RUNNER_REQUESTS = {
     KUBERNETES_CPU_REQUEST: "0.5",
     KUBERNETES_MEMORY_REQUEST: "1Gi",
@@ -10234,23 +10234,9 @@ var getDockerBuildRunnerVariables = function () { return ({
     DOCKER_DRIVER: "overlay2",
     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) {
-    return __assign(__assign(__assign({}, getDockerAdditions(context.build.config)), { APP_DIR: context.build.dir, DOCKER_DIR: "." }), (0, exports.getDockerImageVariables)(context));
+    var _a, _b, _c, _d;
+    return __assign({ DOCKERFILE_ADDITIONS: (_b = (_a = context.build.config.docker) === null || _a === void 0 ? void 0 : _a.additionsBegin) === null || _b === void 0 ? void 0 : _b.join("\n"), DOCKERFILE_ADDITIONS_END: (_d = (_c = context.build.config.docker) === null || _c === void 0 ? void 0 : _c.additionsEnd) === null || _d === void 0 ? void 0 : _d.join("\n"), APP_DIR: context.build.dir, DOCKER_DIR: "." }, (0, exports.getDockerImageVariables)(context));
 };
 exports.getDockerBuildVariables = getDockerBuildVariables;
 exports.DOCKER_BUILD_JOB_NAME = "🔨 docker";
@@ -10285,25 +10271,9 @@ var gitlabDockerLogin = function (context) {
     ];
 };
 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 !== null && ensureDockerFileScript !== void 0 ? ensureDockerFileScript : undefined
+        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/
     ])), false), __read((0, gitlab_1.collapseableSection)("docker-push", "Docker push and tag")([
@@ -10468,9 +10438,9 @@ var createNodeBuildJobs = function (context) {
             }
             : undefined,
         dockerBuild: {
-            script: (0, docker_1.getDockerBuildScriptWithBuiltInDockerFile)(context, buildConfig.type === "node-static" || buildConfig.type === "storybook"
-                ? "nginx"
-                : "node"),
+            script: (0, docker_1.getDockerBuildDefaultScript)(context, buildConfig.type === "node-static" || buildConfig.type === "storybook"
+                ? "ensureNginxDockerfile"
+                : "ensureNodeDockerfile"),
             cache: __spreadArray([], __read((0, cache_1.getYarnCache)(context.build, "pull")), false),
             variables: {
                 // only required for non static
@@ -10731,7 +10701,7 @@ var createMeteorBuildJobs = function (context) {
             }
             : undefined,
         dockerBuild: {
-            script: (0, docker_1.getDockerBuildScriptWithBuiltInDockerFile)(context, "meteor"),
+            script: (0, docker_1.getDockerBuildDefaultScript)(context, "ensureMeteorDockerfile"),
             variables: {
                 METEOR_INSTALL_SCRIPTS: buildConfig.installScripts ? "true" : "",
             },

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

@@ -37,7 +37,7 @@ var RUNNER_BUILD_VARIABLES = {
     KUBERNETES_MEMORY_LIMIT: "4Gi",
 };
 var createCustomBuildJobs = function (context) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     var buildConfig = context.build.config;
     if (!(0, types_1.isOfBuildType)(buildConfig, "custom")) {
         throw new Error("deploy config is not custom");
@@ -62,7 +62,7 @@ var createCustomBuildJobs = function (context) {
             }
             : undefined,
         dockerBuild: {
-            script: (0, docker_1.getDockerBuildScriptWithBuiltInDockerFile)(context),
+            script: (0, docker_1.getDockerBuildDefaultScript)(context, ((_d = buildConfig.docker) === null || _d === void 0 ? void 0 : _d.type) === "nginx" ? "ensureNginxDockerfile" : ""),
             variables: {},
         },
     });

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

@@ -1 +1 @@
-{"version":3,"file":"buildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/custom/buildJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA4B;AAE5B,qCAA0C;AAC1C,oCAAsE;AACtE,kCAAyC;AAGzC,gCAA0C;AAE1C,IAAM,sBAAsB,GAAG;IAC7B,sBAAsB,EAAE,KAAK;IAC7B,yBAAyB,EAAE,KAAK;IAChC,uBAAuB,EAAE,KAAK;CAC/B,CAAC;AAEK,IAAM,qBAAqB,GAAG,UACnC,OAAyB;;IAEzB,IAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;IAEzC,IAAI,CAAC,IAAA,qBAAa,EAAC,WAAW,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IAED,OAAO,IAAA,sBAAe,EAAC,OAAO,EAAE;QAC9B,QAAQ,EACN,WAAW,CAAC,YAAY,KAAK,IAAI;YAC/B,CAAC,CAAC;gBACE,KAAK,EAAE,WAAW,CAAC,QAAQ;gBAC3B,eAAe,EAAE,sBAAsB;gBACvC,KAAK,EAAE,WAAW,CAAC,QAAQ;gBAC3B,QAAQ,EAAE,WAAW,CAAC,WAAW;gBACjC,MAAM,2BAAM,CAAC,MAAA,IAAA,mBAAW,EAAC,WAAW,CAAC,YAAY,CAAC,mCAAI,EAAE,CAAC,SAAC;gBAC1D,SAAS,EAAE;oBACT,KAAK;wBACH,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,mBAAmB,CAAC;wBAC5C,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC;8BAC5B,CAAC,MAAA,MAAA,WAAW,CAAC,cAAc,0CAAE,GAAG,CAAC,UAAC,IAAI;wBACvC,OAAA,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC;oBAA7B,CAA6B,CAC9B,mCAAI,EAAE,CAAC,SACT;oBACD,SAAS,EAAE,OAAO;iBACnB;aACF;YACH,CAAC,CAAC,SAAS;QACf,WAAW,EAAE;YACX,MAAM,EAAE,IAAA,kDAAyC,EAAC,OAAO,CAAC;YAE1D,SAAS,EAAE,EAAE;SACd;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AApCW,QAAA,qBAAqB,yBAoChC"}
+{"version":3,"file":"buildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/custom/buildJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA4B;AAE5B,qCAA0C;AAC1C,oCAAwD;AACxD,kCAAyC;AAGzC,gCAA0C;AAE1C,IAAM,sBAAsB,GAAG;IAC7B,sBAAsB,EAAE,KAAK;IAC7B,yBAAyB,EAAE,KAAK;IAChC,uBAAuB,EAAE,KAAK;CAC/B,CAAC;AAEK,IAAM,qBAAqB,GAAG,UACnC,OAAyB;;IAEzB,IAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;IAEzC,IAAI,CAAC,IAAA,qBAAa,EAAC,WAAW,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IAED,OAAO,IAAA,sBAAe,EAAC,OAAO,EAAE;QAC9B,QAAQ,EACN,WAAW,CAAC,YAAY,KAAK,IAAI;YAC/B,CAAC,CAAC;gBACE,KAAK,EAAE,WAAW,CAAC,QAAQ;gBAC3B,eAAe,EAAE,sBAAsB;gBACvC,KAAK,EAAE,WAAW,CAAC,QAAQ;gBAC3B,QAAQ,EAAE,WAAW,CAAC,WAAW;gBACjC,MAAM,2BAAM,CAAC,MAAA,IAAA,mBAAW,EAAC,WAAW,CAAC,YAAY,CAAC,mCAAI,EAAE,CAAC,SAAC;gBAC1D,SAAS,EAAE;oBACT,KAAK;wBACH,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,mBAAmB,CAAC;wBAC5C,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC;8BAC5B,CAAC,MAAA,MAAA,WAAW,CAAC,cAAc,0CAAE,GAAG,CAAC,UAAC,IAAI;wBACvC,OAAA,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC;oBAA7B,CAA6B,CAC9B,mCAAI,EAAE,CAAC,SACT;oBACD,SAAS,EAAE,OAAO;iBACnB;aACF;YACH,CAAC,CAAC,SAAS;QACf,WAAW,EAAE;YACX,MAAM,EAAE,IAAA,oCAA2B,EACjC,OAAO,EACP,CAAA,MAAA,WAAW,CAAC,MAAM,0CAAE,IAAI,MAAK,OAAO,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,EAAE,CACpE;YAED,SAAS,EAAE,EAAE;SACd;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AAvCW,QAAA,qBAAqB,yBAuChC"}

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

@@ -1,4 +1,3 @@
-import type { BuildConfigDocker } from ".";
 import type { ComponentContext } from "../types";
 import type { CatladderJob } from "../types/jobs";
 export declare const getDockerImageVariables: (context: ComponentContext) => {
@@ -22,45 +21,25 @@ export declare const getDockerBuildVariables: (context: ComponentContext) => {
     DOCKER_REGISTRY: string;
     DOCKER_IMAGE: import("../bash/BashExpression").StringOrBashExpression;
     DOCKER_CACHE_IMAGE: string;
+    DOCKERFILE_ADDITIONS: string;
+    DOCKERFILE_ADDITIONS_END: string;
     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;
     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_DIR: 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 type DockerBuildJobDefinition = Partial<CatladderJob>;
 export declare const createDockerBuildJobBase: (context: ComponentContext, { script, ...def }: Partial<CatladderJob>) => CatladderJob;
 export declare const gitlabDockerLogin: (context: ComponentContext) => string[];
-export declare const getDockerBuildScriptWithBuiltInDockerFile: (context: ComponentContext, defaultType?: BuildConfigDocker["type"]) => string[];
-export declare const getDockerBuildDefaultScript: (context: ComponentContext, ensureDockerFileScript?: string | null) => string[];
+export declare const getDockerBuildDefaultScript: (context: ComponentContext, ensureDockerFileScript?: string) => string[];
 export declare const hasDockerfile: (context: ComponentContext) => boolean;

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

@@ -50,15 +50,15 @@ 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;
-var fs_1 = require("fs");
+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 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 gitlab_1 = require("../utils/gitlab");
+var artifactsRegistry_1 = require("../deploy/cloudRun/artifactsRegistry");
+var gcloudServiceAccountLoginCommands_1 = require("../deploy/cloudRun/utils/gcloudServiceAccountLoginCommands");
 var DOCKER_BUILD_RUNNER_REQUESTS = {
     KUBERNETES_CPU_REQUEST: "0.5",
     KUBERNETES_MEMORY_REQUEST: "1Gi",
@@ -100,23 +100,9 @@ var getDockerBuildRunnerVariables = function () { return ({
     DOCKER_DRIVER: "overlay2",
     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) {
-    return __assign(__assign(__assign({}, getDockerAdditions(context.build.config)), { APP_DIR: context.build.dir, DOCKER_DIR: "." }), (0, exports.getDockerImageVariables)(context));
+    var _a, _b, _c, _d;
+    return __assign({ DOCKERFILE_ADDITIONS: (_b = (_a = context.build.config.docker) === null || _a === void 0 ? void 0 : _a.additionsBegin) === null || _b === void 0 ? void 0 : _b.join("\n"), DOCKERFILE_ADDITIONS_END: (_d = (_c = context.build.config.docker) === null || _c === void 0 ? void 0 : _c.additionsEnd) === null || _d === void 0 ? void 0 : _d.join("\n"), APP_DIR: context.build.dir, DOCKER_DIR: "." }, (0, exports.getDockerImageVariables)(context));
 };
 exports.getDockerBuildVariables = getDockerBuildVariables;
 exports.DOCKER_BUILD_JOB_NAME = "🔨 docker";
@@ -151,25 +137,9 @@ var gitlabDockerLogin = function (context) {
     ];
 };
 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 !== null && ensureDockerFileScript !== void 0 ? ensureDockerFileScript : undefined
+        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/
     ])), false), __read((0, gitlab_1.collapseableSection)("docker-push", "Docker push and tag")([

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

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

package/dist/pipeline/src/build/node/buildJob.js

@@ -70,9 +70,9 @@ var createNodeBuildJobs = function (context) {
             }
             : undefined,
         dockerBuild: {
-            script: (0, docker_1.getDockerBuildScriptWithBuiltInDockerFile)(context, buildConfig.type === "node-static" || buildConfig.type === "storybook"
-                ? "nginx"
-                : "node"),
+            script: (0, docker_1.getDockerBuildDefaultScript)(context, buildConfig.type === "node-static" || buildConfig.type === "storybook"
+                ? "ensureNginxDockerfile"
+                : "ensureNodeDockerfile"),
             cache: __spreadArray([], __read((0, cache_1.getYarnCache)(context.build, "pull")), false),
             variables: {
                 // only required for non static

package/dist/pipeline/src/build/node/buildJob.js.map

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

package/dist/pipeline/src/build/node/meteor.js

@@ -75,7 +75,7 @@ var createMeteorBuildJobs = function (context) {
             }
             : undefined,
         dockerBuild: {
-            script: (0, docker_1.getDockerBuildScriptWithBuiltInDockerFile)(context, "meteor"),
+            script: (0, docker_1.getDockerBuildDefaultScript)(context, "ensureMeteorDockerfile"),
             variables: {
                 METEOR_INSTALL_SCRIPTS: buildConfig.installScripts ? "true" : "",
             },

package/dist/pipeline/src/build/node/meteor.js.map

@@ -1 +1 @@
-{"version":3,"file":"meteor.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/meteor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA4B;AAC5B,uCAA8C;AAM9C,gCAA0C;AAC1C,oCAAsE;AACtE,kCAAyC;AACzC,iCAAuC;AACvC,+BAAwC;AAExC,IAAM,cAAc,GAAG,UAAC,OAAyB,IAAuB,OAAA;IACtE;QACE,GAAG,EAAE,OAAO,CAAC,aAAa,GAAG,oBAAoB;QACjD,MAAM,EAAE,WAAW;QACnB,KAAK,EAAE;YACL,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,0CAA0C,CAAC;YACnE,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,4BAA4B,CAAC;YACrD,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,wBAAwB,CAAC;YACjD,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,qCAAqC,CAAC;SAC/D;KACF;CACF,EAXuE,CAWvE,CAAC;AACK,IAAM,qBAAqB,GAAG,UACnC,OAAyB;IAEzB,IAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;IAEzC,IAAI,CAAC,IAAA,qBAAa,EAAC,WAAW,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IAED,IAAM,WAAW,GAAG,IAAA,qBAAc,EAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAElD,OAAO,IAAA,sBAAe,EAAC,OAAO,EAAE;QAC9B,QAAQ,EACN,WAAW,CAAC,YAAY,KAAK,IAAI;YAC/B,CAAC,CAAC;gBACE,KAAK,yCAAM,IAAA,oBAAY,EAAC,OAAO,CAAC,KAAK,CAAC,kBAAK,cAAc,CAAC,OAAO,CAAC,SAAC;gBACnE,KAAK,EAAE,IAAA,uBAAc,EAAC,aAAa,CAAC;gBACpC,SAAS,EAAE;oBACT,iCAAiC,EAAE,GAAG,EAAE,yGAAyG;iBAClJ;gBACD,MAAM,yCACD,WAAW;oBAEd,gCAAgC;oBAChC,iDAAiD;oBACjD,gDAAgD;oBAEhD,kNAAkN;oBAElN,sDAAsD;yBACvD;gBACD,SAAS,EAAE;oBACT,KAAK,EAAE;wBACL,OAAO,CAAC,KAAK,CAAC,GAAG,GAAG,oBAAoB;wBACxC,OAAO,CAAC,KAAK,CAAC,GAAG,GAAG,OAAO;qBAC5B;iBACF;aACF;YACH,CAAC,CAAC,SAAS;QACf,WAAW,EAAE;YACX,MAAM,EAAE,IAAA,kDAAyC,EAAC,OAAO,EAAE,QAAQ,CAAC;YACpE,SAAS,EAAE;gBACT,sBAAsB,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;aACjE;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AA9CW,QAAA,qBAAqB,yBA8ChC"}
+{"version":3,"file":"meteor.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/meteor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA4B;AAC5B,uCAA8C;AAM9C,gCAA0C;AAC1C,oCAAwD;AACxD,kCAAyC;AACzC,iCAAuC;AACvC,+BAAwC;AAExC,IAAM,cAAc,GAAG,UAAC,OAAyB,IAAuB,OAAA;IACtE;QACE,GAAG,EAAE,OAAO,CAAC,aAAa,GAAG,oBAAoB;QACjD,MAAM,EAAE,WAAW;QACnB,KAAK,EAAE;YACL,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,0CAA0C,CAAC;YACnE,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,4BAA4B,CAAC;YACrD,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,wBAAwB,CAAC;YACjD,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,qCAAqC,CAAC;SAC/D;KACF;CACF,EAXuE,CAWvE,CAAC;AACK,IAAM,qBAAqB,GAAG,UACnC,OAAyB;IAEzB,IAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;IAEzC,IAAI,CAAC,IAAA,qBAAa,EAAC,WAAW,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IAED,IAAM,WAAW,GAAG,IAAA,qBAAc,EAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAElD,OAAO,IAAA,sBAAe,EAAC,OAAO,EAAE;QAC9B,QAAQ,EACN,WAAW,CAAC,YAAY,KAAK,IAAI;YAC/B,CAAC,CAAC;gBACE,KAAK,yCAAM,IAAA,oBAAY,EAAC,OAAO,CAAC,KAAK,CAAC,kBAAK,cAAc,CAAC,OAAO,CAAC,SAAC;gBACnE,KAAK,EAAE,IAAA,uBAAc,EAAC,aAAa,CAAC;gBACpC,SAAS,EAAE;oBACT,iCAAiC,EAAE,GAAG,EAAE,yGAAyG;iBAClJ;gBACD,MAAM,yCACD,WAAW;oBAEd,gCAAgC;oBAChC,iDAAiD;oBACjD,gDAAgD;oBAEhD,kNAAkN;oBAElN,sDAAsD;yBACvD;gBACD,SAAS,EAAE;oBACT,KAAK,EAAE;wBACL,OAAO,CAAC,KAAK,CAAC,GAAG,GAAG,oBAAoB;wBACxC,OAAO,CAAC,KAAK,CAAC,GAAG,GAAG,OAAO;qBAC5B;iBACF;aACF;YACH,CAAC,CAAC,SAAS;QACf,WAAW,EAAE;YACX,MAAM,EAAE,IAAA,oCAA2B,EAAC,OAAO,EAAE,wBAAwB,CAAC;YACtE,SAAS,EAAE;gBACT,sBAAsB,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;aACjE;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AA9CW,QAAA,qBAAqB,yBA8ChC"}

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

@@ -51,6 +51,27 @@ export type BuildConfigBase = {
      * define the build command
      */
     buildCommand?: string | string[] | null;
+    /**
+     * customize docker build
+     */
+    docker?: {
+        /**
+         * Custom Dockerfile lines integrated in the generated Dockerfile before the standard build steps.
+         *
+         * - [runner-images/docker-build/scripts/ensureNodeDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureNodeDockerfile)
+         * - [runner-images/docker-build/scripts/ensureNginxDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureNginxDockerfile)
+         * - [runner-images/docker-build/scripts/ensureMeteorDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureMeteorDockerfile)
+         */
+        additionsBegin?: string[];
+        /**
+         * Custom Dockerfile lines integrated in the generated Dockerfile after the standard build steps.
+         *
+         * - [runner-images/docker-build/scripts/ensureNodeDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureNodeDockerfile)
+         * - [runner-images/docker-build/scripts/ensureNginxDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureNginxDockerfile)
+         * - [runner-images/docker-build/scripts/ensureMeteorDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureMeteorDockerfile)
+         */
+        additionsEnd?: string[];
+    };
     /**
      * customize lint, set false to disable
      */
@@ -95,12 +116,10 @@ export type BuildConfigNodeBase = BuildConfigBase & {
 };
 export type BuildConfigNode = {
     type: "node";
-    docker?: Omit<BuildConfigDockerBuiltInNode, "type"> | BuildConfigDocker;
 } & BuildConfigNodeBase;
 export type BuildConfigNodeStatic = BuildConfigNodeBase & {
     type: "node-static";
     startCommand?: never;
-    docker?: Omit<BuildConfigDockerBuiltInNgninx, "type"> | BuildConfigDocker;
 };
 export type BuildConfigMeteor = BuildConfigNodeBase & {
     type: "meteor";
@@ -109,44 +128,18 @@ export type BuildConfigMeteor = BuildConfigNodeBase & {
      * This is only required if you have custom scripts in your image
      */
     installScripts?: boolean;
-    docker?: Omit<BuildConfigDockerBuiltInMeteor, "type"> | BuildConfigDocker;
 };
-type BuildConfigDockerWithAdditions = {
-    /**
-     * Custom Dockerfile lines integrated in the generated Dockerfile before the standard build steps.
-     *
-     */
-    additionsBegin?: string[];
-    /**
-     * Custom Dockerfile lines integrated in the generated Dockerfile after the standard build steps.
-     *
-     */
-    additionsEnd?: string[];
-};
-type BuildConfigDockerBuiltInNode = {
-    type: "node";
-} & BuildConfigDockerWithAdditions;
-type BuildConfigDockerBuiltInMeteor = {
-    type: "meteor";
-} & BuildConfigDockerWithAdditions;
-type BuildConfigDockerBuiltInNgninx = {
+export type BuildConfigCustomDocker = BuildConfigBase["docker"] & ({
     /**
      * use the built-in nginx image for simple static apps
      */
     type: "nginx";
-} & BuildConfigDockerWithAdditions;
-type BuildConfigDockerBuiltIn = BuildConfigDockerBuiltInNgninx | BuildConfigDockerBuiltInNode | BuildConfigDockerBuiltInMeteor;
-type BuildConfigDockerCustom = {
+} | {
     /**
      * custom docker build, expect that a Dockerfile in your directory
      */
     type: "custom";
-};
-export type BuildConfigDocker = BuildConfigDockerBuiltIn | BuildConfigDockerCustom;
-/**
- * @deprecated this type is no longer used. Use {@link BuildConfigDocker} instead.
- */
-export type BuildConfigCustomDocker = BuildConfigDockerCustom | BuildConfigDockerBuiltInNgninx;
+});
 export type BuildConfigCustom = Omit<BuildConfigBase, "lint" | "test" | "audit"> & {
     type: "custom";
     jobImage: GitlabJobImage;
@@ -154,7 +147,7 @@ export type BuildConfigCustom = Omit<BuildConfigBase, "lint" | "test" | "audit">
      * {@link Services}s used in lint, test, audit, and build jobs.
      */
     jobServices?: Services;
-    docker: BuildConfigDocker;
+    docker: BuildConfigCustomDocker;
     /**
      * custom lint, disabled when not set
      */
@@ -235,4 +228,3 @@ export declare const isOfBuildType: <T extends ("custom" | "node" | "node-static
 }> | Extract<BuildConfigStorybook, {
     type: T[number];
 }>;
-export {};

package/dist/pipeline/src/build/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/types.ts"],"names":[],"mappings":";;;AAsRO,IAAM,aAAa,GAAG,UAC3B,CAAc;IACd,eAAW;SAAX,UAAW,EAAX,qBAAW,EAAX,IAAW;QAAX,8BAAW;;IAEX,OAAO,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AAChC,CAAC,CAAC;AALW,QAAA,aAAa,iBAKxB"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/types.ts"],"names":[],"mappings":";;;AAuQO,IAAM,aAAa,GAAG,UAC3B,CAAc;IACd,eAAW;SAAX,UAAW,EAAX,qBAAW,EAAX,IAAW;QAAX,8BAAW;;IAEX,OAAO,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AAChC,CAAC,CAAC;AALW,QAAA,aAAa,iBAKxB"}