@catladder/pipeline 1.123.1 → 1.124.1

package/dist/build/custom/buildJob.js

@@ -75,7 +75,7 @@ var createCustomBuildJobs = function (context) {
       }
     } : undefined,
     dockerBuild: {
-      script: (0, docker_1.getDockerBuildDefaultScript)(((_d = buildConfig.docker) === null || _d === void 0 ? void 0 : _d.type) === "nginx" ? "ensureNginxDockerfile" : ""),
+      script: (0, docker_1.getDockerBuildDefaultScript)(context, ((_d = buildConfig.docker) === null || _d === void 0 ? void 0 : _d.type) === "nginx" ? "ensureNginxDockerfile" : ""),
       variables: {}
     }
   });

package/dist/build/docker.d.ts

@@ -1,12 +1,16 @@
 import type { Context } from "../types";
 import type { CatladderJob } from "../types/jobs";
 export declare const getDockerImageVariables: (context: Context) => {
+  DOCKER_IMAGE_TAG: string;
+  DOCKER_REGISTRY: string;
+  DOCKER_IMAGE: string;
+  DOCKER_CACHE_IMAGE: string;
+} | {
+  DOCKER_IMAGE_TAG: string;
   DOCKER_REGISTRY: string;
-  DOCKER_REGISTRY_IMAGE_PATH: string;
   DOCKER_CACHE_IMAGE: string;
   DOCKER_IMAGE_NAME: string;
   DOCKER_IMAGE: string;
-  DOCKER_IMAGE_TAG: string;
 };
 /**
  * Weather the context requires a docker build
@@ -17,12 +21,28 @@ export declare const requiresDockerBuild: ({
   }
 }: Context) => boolean;
 export declare const getDockerBuildVariables: (context: Context) => {
+  DOCKER_IMAGE_TAG: string;
+  DOCKER_REGISTRY: string;
+  DOCKER_IMAGE: string;
+  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_CPU_LIMIT: string;
+  KUBERNETES_MEMORY_REQUEST: string;
+  KUBERNETES_MEMORY_LIMIT: string;
+} | {
+  DOCKER_IMAGE_TAG: string;
   DOCKER_REGISTRY: string;
-  DOCKER_REGISTRY_IMAGE_PATH: string;
   DOCKER_CACHE_IMAGE: string;
   DOCKER_IMAGE_NAME: string;
   DOCKER_IMAGE: string;
-  DOCKER_IMAGE_TAG: string;
   DOCKER_HOST: string;
   DOCKER_TLS_CERTDIR: string;
   DOCKER_DRIVER: string;
@@ -55,6 +75,6 @@ export declare const createDockerBuildJobBase: (context: Context, {
   script,
   ...def
 }: Partial<CatladderJob>) => CatladderJob;
-export declare const gitlabDockerLogin = "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY";
-export declare const getDockerBuildDefaultScript: (ensureDockerFileScript?: string | undefined) => (string | undefined)[];
+export declare const gitlabDockerLogin: (context: Context) => string[];
+export declare const getDockerBuildDefaultScript: (context: Context, ensureDockerFileScript?: string | undefined) => (string | undefined)[];
 export declare const hasDockerfile: (context: Context) => boolean;

package/dist/build/docker.js

@@ -18,6 +18,37 @@ var __rest = this && this.__rest || function (s, e) {
   }
   return t;
 };
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+    r,
+    ar = [],
+    e;
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+  return ar;
+};
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
 var __importDefault = this && this.__importDefault || function (mod) {
   return mod && mod.__esModule ? mod : {
     "default": mod
@@ -30,6 +61,9 @@ var deploy_1 = require("../deploy");
 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_RUNNER_BUILD_VARIABLES = {
   KUBERNETES_CPU_REQUEST: "0.5",
   KUBERNETES_CPU_LIMIT: "1",
@@ -37,14 +71,21 @@ var DOCKER_RUNNER_BUILD_VARIABLES = {
   KUBERNETES_MEMORY_LIMIT: "2Gi"
 };
 var getDockerImageVariables = function (context) {
-  return {
+  return __assign(__assign({}, (0, deploy_1.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun") ? {
+    DOCKER_REGISTRY: (0, artifactsRegistry_1.getArtifactsRegistryHost)(context),
+    DOCKER_IMAGE: (0, artifactsRegistry_1.getArtifactsRegistryImageName)(context),
+    DOCKER_CACHE_IMAGE: (0, artifactsRegistry_1.getArtifactsRegistryBuildCacheImage)(context)
+  } :
+  // gitlab registry:
+  {
     DOCKER_REGISTRY: "$CI_REGISTRY",
-    DOCKER_REGISTRY_IMAGE_PATH: "$CI_REGISTRY_IMAGE",
-    DOCKER_CACHE_IMAGE: "$DOCKER_REGISTRY_IMAGE_PATH/caches/" + context.componentName,
+    DOCKER_CACHE_IMAGE: "$CI_REGISTRY_IMAGE/caches/" + context.componentName,
+    // ONLY USED IN KUBERNETES
     DOCKER_IMAGE_NAME: context.environment.shortName + "/" + context.componentName,
-    DOCKER_IMAGE: "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
+    DOCKER_IMAGE: "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME"
+  }), {
     DOCKER_IMAGE_TAG: "$CI_COMMIT_SHA"
-  };
+  });
 };
 exports.getDockerImageVariables = getDockerImageVariables;
 /**
@@ -99,9 +140,13 @@ var createDockerBuildJobBase = function (context, _a) {
   }, def);
 };
 exports.createDockerBuildJobBase = createDockerBuildJobBase;
-exports.gitlabDockerLogin = "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY";
-var getDockerBuildDefaultScript = function (ensureDockerFileScript) {
-  return [ensureDockerFileScript, exports.gitlabDockerLogin, "docker version", "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", "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG", "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE", "docker push $DOCKER_CACHE_IMAGE"].filter(Boolean);
+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 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/
+  ])), 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) {

package/dist/build/node/buildJob.js

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

package/dist/build/node/meteor.js

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

package/dist/build/rails/build.js

@@ -32,6 +32,15 @@ var __read = this && this.__read || function (o, n) {
   }
   return ar;
 };
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
 exports.__esModule = true;
 exports.createRailsBuildJobs = void 0;
 var base_1 = require("../base");
@@ -48,7 +57,7 @@ var createRailsBuildJobs = function (context) {
     return (0, base_1.createBuildJobs)(context, {
       appBuild: undefined,
       dockerBuild: {
-        script: (0, docker_1.getDockerBuildDefaultScript)(),
+        script: (0, docker_1.getDockerBuildDefaultScript)(context),
         variables: {}
       }
     });
@@ -65,9 +74,9 @@ var createRailsBuildJobs = function (context) {
     dockerBuild: {
       variables: __assign(__assign({}, context.environment.jobOnlyVars.build.envVars), context.componentConfig.build.extraVars),
       // custom script
-      script: [docker_1.gitlabDockerLogin, "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), ["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 : "")]
+      "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)
     }
   });
 };