@catladder/pipeline 0.0.0-refactor-cloud-run-825d7e86 → 0.0.0-refactor-docker-9fda97e9

package/dist/build/custom/testJob.js

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

package/dist/build/docker.d.ts

@@ -1,9 +1,10 @@
 import type { Context } from "../types";
 import type { CatladderJob } from "../types/jobs";
+import type { BuildConfigDocker } from ".";
 export declare const getDockerImageVariables: (context: Context) => {
   DOCKER_IMAGE_TAG: string;
   DOCKER_REGISTRY: string;
-  DOCKER_IMAGE: string;
+  DOCKER_IMAGE: import("../bash/BashExpression").StringOrBashExpression;
   DOCKER_CACHE_IMAGE: string;
 } | {
   DOCKER_IMAGE_TAG: string;
@@ -23,56 +24,50 @@ export declare const requiresDockerBuild: ({
 export declare const getDockerBuildVariables: (context: Context) => {
   DOCKER_IMAGE_TAG: string;
   DOCKER_REGISTRY: string;
-  DOCKER_IMAGE: string;
+  DOCKER_IMAGE: import("../bash/BashExpression").StringOrBashExpression;
   DOCKER_CACHE_IMAGE: string;
-  DOCKER_HOST: string;
-  DOCKER_TLS_CERTDIR: string;
-  DOCKER_DRIVER: string;
-  DOCKER_BUILDKIT: string;
-  DOCKERFILE_ADDITIONS: string | undefined;
-  DOCKERFILE_ADDITIONS_END: string | undefined;
   APP_DIR: string;
   DOCKER_DIR: string;
-  KUBERNETES_CPU_REQUEST: string;
-  KUBERNETES_MEMORY_REQUEST: string;
-  KUBERNETES_MEMORY_LIMIT: 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;
-  DOCKER_HOST: string;
-  DOCKER_TLS_CERTDIR: string;
-  DOCKER_DRIVER: string;
-  DOCKER_BUILDKIT: 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;
-  KUBERNETES_CPU_REQUEST: string;
-  KUBERNETES_MEMORY_REQUEST: string;
-  KUBERNETES_MEMORY_LIMIT: string;
+  DOCKERFILE_ADDITIONS: string | undefined;
+  DOCKERFILE_ADDITIONS_END: string | undefined;
 };
 export declare const DOCKER_BUILD_JOB_NAME = "\uD83D\uDD28 docker";
-export declare const getDockerJobBaseProps: (context: Context) => {
-  image: string;
-  services: {
-    name: string;
-    command: string[];
-  }[];
-  variables: {
-    DOCKER_HOST: string;
-    DOCKER_TLS_CERTDIR: string;
-    DOCKER_DRIVER: string;
-    DOCKER_BUILDKIT: string;
-  };
-};
-export declare type DockerBuildJobDefinition = Partial<CatladderJob>;
+export declare const getDockerJobBaseProps: (context: Context) => Pick<CatladderJob, "image" | "services" | "variables" | "runnerVariables">;
+export type DockerBuildJobDefinition = Partial<CatladderJob>;
 export declare const createDockerBuildJobBase: (context: Context, {
   script,
   ...def
 }: Partial<CatladderJob>) => CatladderJob;
 export declare const gitlabDockerLogin: (context: Context) => string[];
-export declare const getDockerBuildDefaultScript: (context: Context, ensureDockerFileScript?: string | undefined) => (string | undefined)[];
+export declare const getDockerBuildScriptWithBuiltInDockerFile: (context: Context, defaultType?: BuildConfigDocker["type"]) => (string | undefined)[];
+export declare const getDockerBuildDefaultScript: (context: Context, ensureDockerFileScript?: string | null) => (string | undefined)[];
 export declare const hasDockerfile: (context: Context) => boolean;

package/dist/build/docker.js

@@ -54,8 +54,10 @@ var __importDefault = this && this.__importDefault || function (mod) {
     "default": mod
   };
 };
-exports.__esModule = true;
-exports.hasDockerfile = exports.getDockerBuildDefaultScript = exports.gitlabDockerLogin = exports.createDockerBuildJobBase = exports.getDockerJobBaseProps = exports.DOCKER_BUILD_JOB_NAME = exports.getDockerBuildVariables = exports.requiresDockerBuild = exports.getDockerImageVariables = void 0;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.hasDockerfile = exports.getDockerBuildDefaultScript = exports.getDockerBuildScriptWithBuiltInDockerFile = exports.gitlabDockerLogin = exports.createDockerBuildJobBase = exports.getDockerJobBaseProps = exports.DOCKER_BUILD_JOB_NAME = exports.getDockerBuildVariables = exports.requiresDockerBuild = exports.getDockerImageVariables = void 0;
 var lodash_1 = require("lodash");
 var deploy_1 = require("../deploy");
 var runner_1 = require("../runner");
@@ -64,7 +66,7 @@ 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_RUNNER_BUILD_VARIABLES = {
+var DOCKER_BUILD_RUNNER_REQUESTS = {
   KUBERNETES_CPU_REQUEST: "0.5",
   KUBERNETES_MEMORY_REQUEST: "1Gi",
   KUBERNETES_MEMORY_LIMIT: "2Gi"
@@ -95,22 +97,30 @@ var requiresDockerBuild = function (_a) {
   return (0, deploy_1.isOfDeployType)(deploy, "kubernetes", "google-cloudrun", "dockerTag") || (0, deploy_1.isOfDeployType)(deploy, "custom") && deploy.requiresDocker;
 };
 exports.requiresDockerBuild = requiresDockerBuild;
-var getDockerBaseVariables = function () {
+// those need to be runner variables
+var getDockerBuildRunnerVariables = function () {
   return {
     DOCKER_HOST: "tcp://0.0.0.0:2375",
     DOCKER_TLS_CERTDIR: "",
     DOCKER_DRIVER: "overlay2",
-    DOCKER_BUILDKIT: "1"
+    DOCKER_BUILDKIT: "1" // see https://docs.docker.com/develop/develop-images/build_enhancements/
+  };
+};
+
+var getDockerAdditions = function (build) {
+  var _a, _b;
+  if (!("docker" in build)) return {};
+  if (!build.docker) return {};
+  return {
+    DOCKERFILE_ADDITIONS: "additionsBegin" in build.docker ? (_a = build.docker.additionsBegin) === null || _a === void 0 ? void 0 : _a.join("\n") : undefined,
+    DOCKERFILE_ADDITIONS_END: "additionsEnd" in build.docker ? (_b = build.docker.additionsEnd) === null || _b === void 0 ? void 0 : _b.join("\n") : undefined
   };
 };
 var getDockerBuildVariables = function (context) {
-  var _a, _b, _c, _d;
-  return __assign(__assign(__assign(__assign({}, DOCKER_RUNNER_BUILD_VARIABLES), {
-    DOCKERFILE_ADDITIONS: (_b = (_a = context.componentConfig.build.docker) === null || _a === void 0 ? void 0 : _a.additionsBegin) === null || _b === void 0 ? void 0 : _b.join("\n"),
-    DOCKERFILE_ADDITIONS_END: (_d = (_c = context.componentConfig.build.docker) === null || _c === void 0 ? void 0 : _c.additionsEnd) === null || _d === void 0 ? void 0 : _d.join("\n"),
+  return __assign(__assign(__assign({}, getDockerAdditions(context.componentConfig.build)), {
     APP_DIR: context.componentConfig.dir,
     DOCKER_DIR: "."
-  }), getDockerBaseVariables()), (0, exports.getDockerImageVariables)(context));
+  }), (0, exports.getDockerImageVariables)(context));
 };
 exports.getDockerBuildVariables = getDockerBuildVariables;
 exports.DOCKER_BUILD_JOB_NAME = "🔨 docker";
@@ -119,9 +129,11 @@ var getDockerJobBaseProps = function (context) {
     image: (0, runner_1.getRunnerImage)("docker-build"),
     services: [{
       name: "docker:24.0.6-dind",
+      // see see https://gitlab.com/gitlab-org/gitlab-runner/-/issues/27300#note_466755332
       command: ["--tls=false"]
     }],
-    variables: getDockerBaseVariables()
+    variables: {},
+    runnerVariables: getDockerBuildRunnerVariables()
   };
 };
 exports.getDockerJobBaseProps = getDockerJobBaseProps;
@@ -135,7 +147,8 @@ var createDockerBuildJobBase = function (context, _a) {
   }, (0, exports.getDockerJobBaseProps)(context)), {
     script: script || []
   }), {
-    variables: (0, exports.getDockerBuildVariables)(context)
+    variables: (0, exports.getDockerBuildVariables)(context),
+    runnerVariables: __assign(__assign({}, DOCKER_BUILD_RUNNER_REQUESTS), getDockerBuildRunnerVariables())
   }, def);
 };
 exports.createDockerBuildJobBase = createDockerBuildJobBase;
@@ -143,12 +156,24 @@ 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"];
 };
 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.componentConfig.dir, "Dockerfile"));
 };
 exports.hasDockerfile = hasDockerfile;

package/dist/build/index.d.ts

@@ -4,7 +4,7 @@ import type { CatladderJob } from "../types/jobs";
 import type { BuildConfig, BuildConfigType } from "./types";
 export * from "./types";
 export * from "./node";
-export declare type BuildTypes = { [type in BuildConfigType]: {
+export type BuildTypes = { [type in BuildConfigType]: {
   jobs: (context: Context) => CatladderJob[];
   defaults: (envContext: EnvironmentContext<BuildConfigType, any>) => Partial<Extract<BuildConfig, {
     type: type;

package/dist/build/index.js

@@ -2,12 +2,16 @@
 
 var __createBinding = this && this.__createBinding || (Object.create ? function (o, m, k, k2) {
   if (k2 === undefined) k2 = k;
-  Object.defineProperty(o, k2, {
-    enumerable: true,
-    get: function () {
-      return m[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];
@@ -15,7 +19,9 @@ var __createBinding = this && this.__createBinding || (Object.create ? function
 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);
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.BUILD_TYPES = void 0;
 var custom_1 = require("./custom");
 var node_1 = require("./node");

package/dist/build/node/buildJob.js

@@ -1,15 +1,5 @@
 "use strict";
 
-var __assign = this && this.__assign || function () {
-  __assign = Object.assign || function (t) {
-    for (var s, i = 1, n = arguments.length; i < n; i++) {
-      s = arguments[i];
-      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-    }
-    return t;
-  };
-  return __assign.apply(this, arguments);
-};
 var __read = this && this.__read || function (o, n) {
   var m = typeof Symbol === "function" && o[Symbol.iterator];
   if (!m) return o;
@@ -41,7 +31,9 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createNodeBuildJobs = void 0;
 var path_1 = require("path");
 var runner_1 = require("../../runner");
@@ -63,7 +55,7 @@ var createNodeBuildJobs = function (context) {
   return (0, base_1.createBuildJobs)(context, {
     appBuild: buildConfig.buildCommand !== null ? {
       image: (_a = buildConfig.jobImage) !== null && _a !== void 0 ? _a : defaultImage,
-      variables: __assign({}, constants_1.NODE_RUNNER_BUILD_VARIABLES),
+      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),
       script: __spreadArray(__spreadArray([], __read(yarnInstall), false), __read((_c = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _c !== void 0 ? _c : []), false),
       artifacts: {
@@ -79,7 +71,7 @@ var createNodeBuildJobs = function (context) {
       jobTags: buildConfig.jobTags
     } : undefined,
     dockerBuild: {
-      script: (0, docker_1.getDockerBuildDefaultScript)(context, buildConfig.type === "node-static" || buildConfig.type === "storybook" ? "ensureNginxDockerfile" : "ensureNodeDockerfile"),
+      script: (0, docker_1.getDockerBuildScriptWithBuiltInDockerFile)(context, buildConfig.type === "node-static" ? "nginx" : "node"),
       cache: __spreadArray([], __read((0, cache_1.getYarnCache)(context, "pull")), false),
       variables: {
         // only required for non static

package/dist/build/node/cache.js

@@ -36,7 +36,9 @@ var __importDefault = this && this.__importDefault || function (mod) {
     "default": mod
   };
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.getNextCache = exports.getNodeCache = exports.getNodeModulesCache = exports.getYarnCache = void 0;
 var path_1 = require("path");
 var slugify_1 = __importDefault(require("slugify"));
@@ -52,7 +54,7 @@ var getYarnCache = function (context, policy) {
     policy: policy,
     paths: [".yarn"]
   } : {
-    key: (0, slugify_1["default"])(context.componentConfig.dir) + "-yarn",
+    key: (0, slugify_1.default)(context.componentConfig.dir) + "-yarn",
     policy: policy,
     paths: [(0, path_1.join)(context.componentConfig.dir, ".yarn")]
   }];
@@ -68,7 +70,8 @@ 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.componentConfig.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");

package/dist/build/node/constants.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.NODE_RUNNER_BUILD_VARIABLES = void 0;
 exports.NODE_RUNNER_BUILD_VARIABLES = {
   KUBERNETES_CPU_REQUEST: "0.5",

package/dist/build/node/index.js

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

package/dist/build/node/meteor.js

@@ -31,7 +31,9 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createMeteorBuildJobs = void 0;
 var path_1 = require("path");
 var runner_1 = require("../../runner");
@@ -58,15 +60,16 @@ var createMeteorBuildJobs = function (context) {
       cache: __spreadArray(__spreadArray([], __read((0, cache_1.getNodeCache)(context)), false), __read(getMeteorCache(context)), false),
       image: (0, runner_1.getRunnerImage)("jobs-meteor"),
       variables: {
-        METEOR_DISABLE_OPTIMISTIC_CACHING: "1"
+        METEOR_DISABLE_OPTIMISTIC_CACHING: "1" // see https://forums.meteor.com/t/veeery-long-building-time-inside-docker-container/58673/17?u=macrozone
       },
+
       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"]
       }
     } : 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.js

@@ -41,7 +41,9 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createNodeTestJobs = void 0;
 var runner_1 = require("../../runner");
 var utils_1 = require("../../utils");
@@ -50,17 +52,19 @@ var constants_1 = require("./constants");
 var yarn_1 = require("./yarn");
 var createArtifactsConfig_1 = require("../base/createArtifactsConfig");
 var createNodeTestJobs = function (context) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
   // don't run tests after release
-  if (((_a = context.commitInfo) === null || _a === void 0 ? void 0 : _a.trigger) === "taggedRelease") {
+  // TODO: this will be replaced by using rules
+  if (context.trigger === "taggedRelease") {
     return [];
   }
   var buildConfig = context.componentConfig.build;
   var defaultImage = (0, runner_1.getRunnerImage)("jobs-default");
   var base = {
-    variables: __assign(__assign(__assign({
+    variables: __assign(__assign({
       APP_PATH: context.componentConfig.dir
-    }, constants_1.NODE_RUNNER_BUILD_VARIABLES), context.environment.jobOnlyVars.build.envVars), (_b = buildConfig.extraVars) !== null && _b !== void 0 ? _b : {}),
+    }, context.environment.jobOnlyVars.build.envVars), (_a = buildConfig.extraVars) !== null && _a !== void 0 ? _a : {}),
+    runnerVariables: constants_1.NODE_RUNNER_BUILD_VARIABLES,
     stage: "test",
     needs: [],
     envMode: "none"
@@ -69,26 +73,26 @@ var createNodeTestJobs = function (context) {
   var auditJob = buildConfig.audit !== false ? __assign(__assign(__assign({
     name: "🛡 audit"
   }, base), {
-    image: (_d = (_c = buildConfig.audit) === null || _c === void 0 ? void 0 : _c.jobImage) !== null && _d !== void 0 ? _d : defaultImage,
+    image: (_c = (_b = buildConfig.audit) === null || _b === void 0 ? void 0 : _b.jobImage) !== null && _c !== void 0 ? _c : defaultImage,
     cache: undefined,
-    script: __spreadArray(["cd ".concat(context.componentConfig.dir)], __read((_f = (0, utils_1.ensureArray)((_e = buildConfig.audit) === null || _e === void 0 ? void 0 : _e.command)) !== null && _f !== void 0 ? _f : [((_g = context.packageManagerInfo) === null || _g === void 0 ? void 0 : _g.isClassic) ? "yarn audit" : "yarn npm audit --environment production" // yarn 2
+    script: __spreadArray(["cd ".concat(context.componentConfig.dir)], __read((_e = (0, utils_1.ensureArray)((_d = buildConfig.audit) === null || _d === void 0 ? void 0 : _d.command)) !== null && _e !== void 0 ? _e : [((_f = context.packageManagerInfo) === null || _f === void 0 ? void 0 : _f.isClassic) ? "yarn audit" : "yarn npm audit --environment production" // yarn 2
     ]), false),
     allow_failure: true
-  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.componentConfig.dir, (_h = buildConfig.audit) === null || _h === void 0 ? void 0 : _h.artifactsReports, (_j = buildConfig.audit) === null || _j === void 0 ? void 0 : _j.artifacts)) : null;
+  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.componentConfig.dir, (_g = buildConfig.audit) === null || _g === void 0 ? void 0 : _g.artifactsReports, (_h = buildConfig.audit) === null || _h === void 0 ? void 0 : _h.artifacts)) : null;
   var lintJob = buildConfig.lint !== false ? __assign(__assign(__assign({
     name: "👮 lint"
   }, base), {
-    image: (_l = (_k = buildConfig.lint) === null || _k === void 0 ? void 0 : _k.jobImage) !== null && _l !== void 0 ? _l : defaultImage,
+    image: (_k = (_j = buildConfig.lint) === null || _j === void 0 ? void 0 : _j.jobImage) !== null && _k !== void 0 ? _k : defaultImage,
     cache: (0, cache_1.getNodeCache)(context),
-    script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, yarn_1.ensureNodeVersion)(context)), false), ["cd ".concat(context.componentConfig.dir)], false), __read(yarnInstall), false), __read((_o = (0, utils_1.ensureArray)((_m = buildConfig.lint) === null || _m === void 0 ? void 0 : _m.command)) !== null && _o !== void 0 ? _o : ["yarn lint"]), false)
-  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.componentConfig.dir, (_p = buildConfig.lint) === null || _p === void 0 ? void 0 : _p.artifactsReports, (_q = buildConfig.lint) === null || _q === void 0 ? void 0 : _q.artifacts)) : null;
+    script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, yarn_1.ensureNodeVersion)(context)), false), ["cd ".concat(context.componentConfig.dir)], false), __read(yarnInstall), false), __read((_m = (0, utils_1.ensureArray)((_l = buildConfig.lint) === null || _l === void 0 ? void 0 : _l.command)) !== null && _m !== void 0 ? _m : ["yarn lint"]), false)
+  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.componentConfig.dir, (_o = buildConfig.lint) === null || _o === void 0 ? void 0 : _o.artifactsReports, (_p = buildConfig.lint) === null || _p === void 0 ? void 0 : _p.artifacts)) : null;
   var testJob = buildConfig.test !== false ? __assign(__assign(__assign({
     name: "🧪 test"
   }, base), {
-    image: (_s = (_r = buildConfig.test) === null || _r === void 0 ? void 0 : _r.jobImage) !== null && _s !== void 0 ? _s : (0, runner_1.getRunnerImage)("jobs-testing-chrome"),
+    image: (_r = (_q = buildConfig.test) === null || _q === void 0 ? void 0 : _q.jobImage) !== null && _r !== void 0 ? _r : (0, runner_1.getRunnerImage)("jobs-testing-chrome"),
     cache: (0, cache_1.getNodeCache)(context),
-    script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, yarn_1.ensureNodeVersion)(context)), false), ["cd ".concat(context.componentConfig.dir)], false), __read(yarnInstall), false), __read((_u = (0, utils_1.ensureArray)((_t = buildConfig.test) === null || _t === void 0 ? void 0 : _t.command)) !== null && _u !== void 0 ? _u : ["yarn test"]), false)
-  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.componentConfig.dir, (_v = buildConfig.test) === null || _v === void 0 ? void 0 : _v.artifactsReports, (_w = buildConfig.test) === null || _w === void 0 ? void 0 : _w.artifacts)) : null;
+    script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, yarn_1.ensureNodeVersion)(context)), false), ["cd ".concat(context.componentConfig.dir)], false), __read(yarnInstall), false), __read((_t = (0, utils_1.ensureArray)((_s = buildConfig.test) === null || _s === void 0 ? void 0 : _s.command)) !== null && _t !== void 0 ? _t : ["yarn test"]), false)
+  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.componentConfig.dir, (_u = buildConfig.test) === null || _u === void 0 ? void 0 : _u.artifactsReports, (_v = buildConfig.test) === null || _v === void 0 ? void 0 : _v.artifacts)) : null;
   return [auditJob, lintJob, testJob].filter(utils_1.notNil);
 };
 exports.createNodeTestJobs = createNodeTestJobs;

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

@@ -1,6 +1,7 @@
+import { BashExpression } from "../../bash/BashExpression";
 import type { Context } from "../../types";
 export declare const ensureNodeVersion: (context: Context) => string[];
 export declare const getYarnInstall: (context: Context, options?: {
   noCustomPostInstall: boolean;
-} | undefined) => string[];
-export declare const getDockerAppCopyAndBuildScript: (context: Context) => string;
+}) => string[];
+export declare const getDockerAppCopyAndBuildScript: (context: Context) => BashExpression;

package/dist/build/node/yarn.js

@@ -31,8 +31,11 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.getDockerAppCopyAndBuildScript = exports.getYarnInstall = exports.ensureNodeVersion = void 0;
+var BashExpression_1 = require("../../bash/BashExpression");
 var utils_1 = require("../../utils");
 var gitlab_1 = require("../../utils/gitlab");
 var YARN_INSTALL_CLASSIC = "yarn install --frozen-lockfile";
@@ -59,7 +62,7 @@ var DOCKER_COPY_FILES = "COPY --chown=node:node $APP_DIR .";
 var getDockerAppCopyAndBuildScript = function (context) {
   var _a;
   if ((_a = context.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.isClassic) {
-    return "\nRUN ".concat(YARN_INSTALL_CLASSIC, " --production --ignore-scripts\n").concat(DOCKER_COPY_FILES, "\nRUN ").concat(YARN_INSTALL_CLASSIC, " --production \n    ").trim();
+    return new BashExpression_1.BashExpression("\nRUN ".concat(YARN_INSTALL_CLASSIC, " --production --ignore-scripts\n").concat(DOCKER_COPY_FILES, "\nRUN ").concat(YARN_INSTALL_CLASSIC, " --production \n    ").trim());
   }
   // yarn >= 4 ships with build in plugins, see https://github.com/yarnpkg/berry/pull/4253
   // trying to import those fail on this version
@@ -70,6 +73,6 @@ var getDockerAppCopyAndBuildScript = function (context) {
   var maybeAddWorkspaceToolsCommand = doesNotShipWithBuiltInPlugins ? "RUN yarn plugin import workspace-tools" : "";
   // copy first everything and then install
   // rebuild first does not work as it will run postinstall and that might require files in the app
-  return "\n".concat(DOCKER_COPY_FILES, "\n").concat(maybeAddWorkspaceToolsCommand, "\nRUN ").concat(YARN_BERRY_PROD_REBUILD, "\n\n    ").trim();
+  return new BashExpression_1.BashExpression("\n".concat(DOCKER_COPY_FILES, "\n").concat(maybeAddWorkspaceToolsCommand, "\nRUN ").concat(YARN_BERRY_PROD_REBUILD, "\n\n    ").trim());
 };
 exports.getDockerAppCopyAndBuildScript = getDockerAppCopyAndBuildScript;

package/dist/build/rails/build.js

@@ -41,7 +41,9 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createRailsBuildJobs = void 0;
 var base_1 = require("../base");
 var docker_1 = require("../docker");
@@ -74,7 +76,7 @@ var createRailsBuildJobs = function (context) {
     dockerBuild: {
       variables: __assign(__assign({}, context.environment.jobOnlyVars.build.envVars), context.componentConfig.build.extraVars),
       // custom script
-      script: __spreadArray(__spreadArray([], __read((0, docker_1.gitlabDockerLogin)(context)), false), ["docker pull $DOCKER_CACHE_IMAGE || true", "wget --output-document=- https://github.com/buildpacks/pack/releases/download/v".concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "/pack-v").concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "-linux.tgz | tar -zx --directory /usr/local/bin pack"), "chmod +x /usr/local/bin/pack",
+      script: __spreadArray(__spreadArray([], __read((0, docker_1.gitlabDockerLogin)(context)), false), ["cd ".concat(context.componentConfig.dir), "docker pull $DOCKER_CACHE_IMAGE || true", "wget --output-document=- https://github.com/buildpacks/pack/releases/download/v".concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "/pack-v").concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "-linux.tgz | tar -zx --directory /usr/local/bin pack"), "chmod +x /usr/local/bin/pack",
       //  replace private git ssh gem sources with https to make bundler with credentials via env var work
       "sed --in-place 's|git@\\([^:]*\\):|https://\\1/|g' Gemfile Gemfile.lock", "pack build \"$DOCKER_IMAGE:$DOCKER_IMAGE_TAG\" --builder '".concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.image, "' --publish --cache-image \"$DOCKER_CACHE_IMAGE\" ").concat(packEnvArgs, " ").concat((_c = (_b = cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packExtraArgs) === null || _b === void 0 ? void 0 : _b.join(" ")) !== null && _c !== void 0 ? _c : "")], false)
     }

package/dist/build/rails/index.js

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