@catladder/pipeline 1.113.0 → 1.114.0

package/dist/build/docker.d.ts

@@ -56,4 +56,5 @@ export declare const createDockerBuildJobBase: (context: Context, {
   ...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 getDockerBuildDefaultScript: (ensureDockerFileScript?: string | undefined) => (string | undefined)[];
+export declare const hasDockerfile: (context: Context) => boolean;

package/dist/build/docker.js

@@ -18,11 +18,18 @@ var __rest = this && this.__rest || function (s, e) {
   }
   return t;
 };
+var __importDefault = this && this.__importDefault || function (mod) {
+  return mod && mod.__esModule ? mod : {
+    "default": mod
+  };
+};
 exports.__esModule = true;
-exports.getDockerBuildDefaultScript = exports.gitlabDockerLogin = exports.createDockerBuildJobBase = exports.getDockerJobBaseProps = exports.DOCKER_BUILD_JOB_NAME = exports.getDockerBuildVariables = exports.requiresDockerBuild = exports.getDockerImageVariables = void 0;
+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 deploy_1 = require("../deploy");
 var runner_1 = require("../runner");
+var fs_1 = require("fs");
+var path_1 = __importDefault(require("path"));
 var DOCKER_RUNNER_BUILD_VARIABLES = {
   KUBERNETES_CPU_REQUEST: "0.5",
   KUBERNETES_CPU_LIMIT: "1",
@@ -96,4 +103,8 @@ exports.gitlabDockerLogin = "docker login --username gitlab-ci-token --password
 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);
 };
-exports.getDockerBuildDefaultScript = getDockerBuildDefaultScript;
+exports.getDockerBuildDefaultScript = getDockerBuildDefaultScript;
+var hasDockerfile = function (context) {
+  return (0, fs_1.existsSync)(path_1["default"].join(context.componentConfig.dir, "Dockerfile"));
+};
+exports.hasDockerfile = hasDockerfile;

package/dist/build/rails/build.js

@@ -44,6 +44,15 @@ var createRailsBuildJobs = function (context) {
     // should not happen
     throw new Error("build type is not rails");
   }
+  if ((0, docker_1.hasDockerfile)(context)) {
+    return (0, base_1.createBuildJobs)(context, {
+      appBuild: undefined,
+      dockerBuild: {
+        script: (0, docker_1.getDockerBuildDefaultScript)(),
+        variables: {}
+      }
+    });
+  }
   var cnbConf = buildConfig.cnbBuilder;
   var packEnvArgs = Object.entries((_a = cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.buildVars) !== null && _a !== void 0 ? _a : {}).map(function (_a) {
     var _b = __read(_a, 2),

package/dist/build/types.d.ts

@@ -167,6 +167,11 @@ export declare type BuildConfigCustom = Omit<BuildConfigBase, "lint" | "test" |
 };
 export declare type BuildConfigRails = BuildConfigBase & {
   type: "rails";
+  /**
+   * The [Cloud Native Buildpacks](https://buildpacks.io/) builder configuration.
+   *
+   * Only applies when there is no `Dockerfile`.
+   */
   cnbBuilder?: {
     /**
      * The Cloud Native Buildpacks builder image to use.