@catladder/pipeline 1.43.0 → 1.44.1

package/dist/build/docker.d.ts

@@ -30,11 +30,38 @@ export declare const getDockerBuildVariables: (context: Context) => {
   KUBERNETES_MEMORY_LIMIT: string;
 };
 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_REGISTRY: string;
+    DOCKER_REGISTRY_IMAGE_PATH: string;
+    DOCKER_CACHE_IMAGE: string;
+    DOCKER_IMAGE_NAME: string;
+    DOCKER_IMAGE: string;
+    DOCKER_IMAGE_TAG: string;
+    DOCKER_BUILDKIT: string;
+    DOCKERFILE_ADDITIONS: string | undefined;
+    DOCKERFILE_ADDITIONS_END: string | undefined;
+    APP_DIR: string;
+    DOCKER_HOST: string;
+    DOCKER_TLS_CERTDIR: string;
+    DOCKER_DIR: string;
+    DOCKER_DRIVER: string;
+    KUBERNETES_CPU_REQUEST: string;
+    KUBERNETES_CPU_LIMIT: string;
+    KUBERNETES_MEMORY_REQUEST: string;
+    KUBERNETES_MEMORY_LIMIT: string;
+  };
+};
 export declare const createDockerBuildJobBase: (context: Context, {
   script,
-  variables,
   ...def
 }: Partial<CatladderJob>) => CatladderJob;
+export declare const gitlabDockerLogin = "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY";
 export declare const createDockerBuildJobDefault: (context: Context, {
   script,
   ...def

package/dist/build/docker.js

@@ -61,7 +61,7 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
 };
 
 exports.__esModule = true;
-exports.createDockerBuildJobDefault = exports.createDockerBuildJobBase = exports.DOCKER_BUILD_JOB_NAME = exports.getDockerBuildVariables = exports.requiresDockerBuild = exports.getDockerImageVariables = void 0;
+exports.createDockerBuildJobDefault = exports.gitlabDockerLogin = exports.createDockerBuildJobBase = exports.getDockerJobBaseProps = exports.DOCKER_BUILD_JOB_NAME = exports.getDockerBuildVariables = exports.requiresDockerBuild = exports.getDockerImageVariables = void 0;
 
 var lodash_1 = require("lodash");
 
@@ -96,6 +96,10 @@ var requiresDockerBuild = function (context) {
     return true;
   }
 
+  if ((0, deploy_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
+    return true;
+  }
+
   if ((0, deploy_1.isOfDeployType)(deployConfig, "custom") && deployConfig.requiresDocker) {
     return true;
   }
@@ -123,33 +127,41 @@ var getDockerBuildVariables = function (context) {
 exports.getDockerBuildVariables = getDockerBuildVariables;
 exports.DOCKER_BUILD_JOB_NAME = "🔨 docker";
 
-var createDockerBuildJobBase = function (context, _a) {
-  var script = _a.script,
-      variables = _a.variables,
-      def = __rest(_a, ["script", "variables"]);
-
-  return (0, lodash_1.merge)({
-    name: exports.DOCKER_BUILD_JOB_NAME,
-    envMode: "jobPerEnv",
-    stage: "build",
+var getDockerJobBaseProps = function (context) {
+  return {
     image: (0, runner_1.getRunnerImage)("docker-build"),
     services: [{
       name: "docker:20-dind",
       command: ["--tls=false"]
     }],
-    variables: __assign(__assign({}, (0, exports.getDockerBuildVariables)(context)), variables !== null && variables !== void 0 ? variables : {}),
+    variables: (0, exports.getDockerBuildVariables)(context)
+  };
+};
+
+exports.getDockerJobBaseProps = getDockerJobBaseProps;
+
+var createDockerBuildJobBase = function (context, _a) {
+  var script = _a.script,
+      def = __rest(_a, ["script"]);
+
+  return (0, lodash_1.merge)(__assign(__assign({
+    name: exports.DOCKER_BUILD_JOB_NAME,
+    envMode: "jobPerEnv",
+    stage: "build"
+  }, (0, exports.getDockerJobBaseProps)(context)), {
     script: script || []
-  }, def);
+  }), def);
 };
 
 exports.createDockerBuildJobBase = createDockerBuildJobBase;
+exports.gitlabDockerLogin = "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY";
 
 var createDockerBuildJobDefault = function (context, _a) {
   var script = _a.script,
       def = __rest(_a, ["script"]);
 
   return (0, exports.createDockerBuildJobBase)(context, __assign({
-    script: __spreadArray(__spreadArray([], __read(script || []), false), ["docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY", "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"], false)
+    script: __spreadArray(__spreadArray([], __read(script || []), false), [exports.gitlabDockerLogin, "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"], false)
   }, def));
 };