@catladder/cli 0.0.0-next-e9e5af68 → 0.0.0-next-aea5d3ad

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

@@ -2,72 +2,66 @@ import type { BuildConfigDocker } from ".";
 import type { ComponentContext, ComponentContextWithBuild, DockerBuildJobDefinition } from "../types";
 import { CatladderJob } from "../types/jobs";
 export declare const getDockerImageVariables: (context: ComponentContext) => {
-  DOCKER_IMAGE_TAG: import("..").BashExpression;
-  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: import("..").BashExpression;
-  DOCKER_REGISTRY: import("..").BashExpression;
-  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: 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: 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: 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: 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: 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: 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: 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;
+    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 class DockerBuildJob extends CatladderJob {
-  constructor(context: ComponentContextWithBuild, {
-    script,
-    cache,
-    variables,
-    runnerVariables,
-    ...def
-  }: DockerBuildJobDefinition);
+    constructor(context: ComponentContextWithBuild, { script, cache, variables, runnerVariables, ...def }: DockerBuildJobDefinition);
 }
 export declare const gitlabDockerLogin: (context: ComponentContext) => 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,13 +1,8 @@
 "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
-});
+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_es_1 = require("lodash-es");
@@ -21,146 +16,174 @@ const jobs_1 = require("../types/jobs");
 const gitlab_1 = require("../utils/gitlab");
 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)
-    } :
-    // 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")
-  };
+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://docker: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: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()
-  };
+    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;
 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))
-    });
-  }
+    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")}`];
+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 `
+    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;
     }
-    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;
+    return fallbackType ? BUILT_IN_ENSURE_DOCKERFILE_SCRIPTS[fallbackType] : null;
 };
 const getDockerBuildScriptWithBuiltInDockerFile = (context, fallbackType) => {
-  return (0, exports.getDockerBuildDefaultScript)(context, getEnsureDockerFileScript(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;
+const hasDockerfile = (context) => (0, fs_1.existsSync)(path_1.default.join(context.build.dir, "Dockerfile"));
+exports.hasDockerfile = hasDockerfile;
+//# sourceMappingURL=docker.js.map

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

@@ -4,17 +4,21 @@ import type { CatladderJob } from "../types/jobs";
 import type { BuildConfig, BuildConfigStandaloneType, WorkspaceBuildConfig } from "./types";
 export * from "./node";
 export * from "./types";
-export type BuildTypes = { [type in BuildConfigStandaloneType]: {
-  jobs: (context: ComponentContextWithBuild) => CatladderJob[] | Promise<CatladderJob[]>;
-  defaults: (envContext: EnvironmentContext) => Partial<Extract<BuildConfig, {
-    type: type;
-  }>>;
-} };
+export type BuildTypes = {
+    [type in BuildConfigStandaloneType]: {
+        jobs: (context: ComponentContextWithBuild) => CatladderJob[] | Promise<CatladderJob[]>;
+        defaults: (envContext: EnvironmentContext) => Partial<Extract<BuildConfig, {
+            type: type;
+        }>>;
+    };
+};
 export declare const BUILD_TYPES: BuildTypes;
-export type WorkspaceBuildTypes = { [type in WorkspaceBuildConfig["type"]]: {
-  jobs: (context: WorkspaceContext) => CatladderJob[] | Promise<CatladderJob[]>;
-  defaults: () => Partial<Extract<WorkspaceBuildConfig, {
-    type: type;
-  }>>;
-} };
-export declare const WORKSPACE_BUILD_TYPES: WorkspaceBuildTypes;
+export type WorkspaceBuildTypes = {
+    [type in WorkspaceBuildConfig["type"]]: {
+        jobs: (context: WorkspaceContext) => CatladderJob[] | Promise<CatladderJob[]>;
+        defaults: () => Partial<Extract<WorkspaceBuildConfig, {
+            type: type;
+        }>>;
+    };
+};
+export declare const WORKSPACE_BUILD_TYPES: WorkspaceBuildTypes;

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

@@ -1,27 +1,19 @@
 "use strict";
-
-var __createBinding = this && this.__createBinding || (Object.create ? function (o, m, k, k2) {
-  if (k2 === undefined) k2 = k;
-  var desc = Object.getOwnPropertyDescriptor(m, k);
-  if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-    desc = {
-      enumerable: true,
-      get: function () {
-        return m[k];
-      }
-    };
-  }
-  Object.defineProperty(o, k2, desc);
-} : function (o, m, k, k2) {
-  if (k2 === undefined) k2 = k;
-  o[k2] = m[k];
-});
-var __exportStar = this && this.__exportStar || function (m, exports) {
-  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.WORKSPACE_BUILD_TYPES = exports.BUILD_TYPES = void 0;
 const custom_1 = require("./custom");
 const node_1 = require("./node");
@@ -29,63 +21,64 @@ const rails_1 = require("./rails");
 __exportStar(require("./node"), exports);
 __exportStar(require("./types"), exports);
 exports.BUILD_TYPES = {
-  node: {
-    jobs: node_1.createNodeJobs,
-    defaults: () => ({
-      buildCommand: "yarn build",
-      startCommand: "yarn start",
-      artifactsPaths: ["dist", ".next"],
-      artifactsExcludePaths: [".next/cache/**/*"]
-    })
-  },
-  "node-static": {
-    jobs: node_1.createNodeJobs,
-    defaults: () => ({
-      buildCommand: "yarn build",
-      artifactsPaths: ["dist"]
-    })
-  },
-  storybook: {
-    jobs: node_1.createStorybookJobs,
-    defaults: () => ({
-      buildCommand: ["yarn build-storybook --quiet -o ./dist"],
-      artifactsPaths: ["dist"]
-    })
-  },
-  meteor: {
-    jobs: node_1.createMeteorJobs,
-    defaults: () => ({
-      startCommand: "node main.js",
-      artifactsPaths: ["dist"]
-    })
-  },
-  custom: {
-    jobs: custom_1.createCustomJobs,
-    defaults: () => ({
-      artifactsPaths: ["dist"]
-    })
-  },
-  rails: {
-    jobs: rails_1.createRailsJobs,
-    defaults: () => ({
-      cnbBuilder: {
-        image: "heroku/builder:24",
-        packVersion: "0.36.4"
-      }
-    })
-  }
+    node: {
+        jobs: node_1.createNodeJobs,
+        defaults: () => ({
+            buildCommand: "yarn build",
+            startCommand: "yarn start",
+            artifactsPaths: ["dist", ".next"],
+            artifactsExcludePaths: [".next/cache/**/*"],
+        }),
+    },
+    "node-static": {
+        jobs: node_1.createNodeJobs,
+        defaults: () => ({
+            buildCommand: "yarn build",
+            artifactsPaths: ["dist"],
+        }),
+    },
+    storybook: {
+        jobs: node_1.createStorybookJobs,
+        defaults: () => ({
+            buildCommand: ["yarn build-storybook --quiet -o ./dist"],
+            artifactsPaths: ["dist"],
+        }),
+    },
+    meteor: {
+        jobs: node_1.createMeteorJobs,
+        defaults: () => ({
+            startCommand: "node main.js",
+            artifactsPaths: ["dist"],
+        }),
+    },
+    custom: {
+        jobs: custom_1.createCustomJobs,
+        defaults: () => ({
+            artifactsPaths: ["dist"],
+        }),
+    },
+    rails: {
+        jobs: rails_1.createRailsJobs,
+        defaults: () => ({
+            cnbBuilder: {
+                image: "heroku/builder:24",
+                packVersion: "0.36.4",
+            },
+        }),
+    },
 };
 exports.WORKSPACE_BUILD_TYPES = {
-  node: {
-    jobs: node_1.createNodeJobs,
-    defaults: () => ({
-      buildCommand: "yarn build",
-      lint: {
-        command: "yarn lint"
-      },
-      test: {
-        command: "yarn test"
-      }
-    })
-  }
-};
+    node: {
+        jobs: node_1.createNodeJobs,
+        defaults: () => ({
+            buildCommand: "yarn build",
+            lint: {
+                command: "yarn lint",
+            },
+            test: {
+                command: "yarn test",
+            },
+        }),
+    },
+};
+//# sourceMappingURL=index.js.map

package/dist/pipeline/src/build/node/buildJob.d.ts

@@ -6,4 +6,4 @@ export declare const createNodeBuildJobs: (context: ComponentContextWithBuild |
 export declare const createNodeBuildJobDefinition: (context: ComponentContext<BuildContextStandalone> | WorkspaceContext) => Promise<AppBuildJobDefinition | undefined>;
 type NewType = ComponentContextWithBuild;
 export declare const createNodeDockerJobDefinition: (context: NewType) => Promise<DockerBuildJobDefinition>;
-export {};
+export {};