@catladder/pipeline 1.113.1 → 1.114.0

package/examples/rails-k8s-with-worker.ts

@@ -1,8 +1,9 @@
+import { rmSync, writeFileSync } from "fs";
 import type { Config } from "../src";
 import { createAllPipelines } from "./__utils__/helpers";
 
 // the image version should match your `.ruby-version`
-const RAILS_TEST_STAGE_IMAGE = "ruby:3.2.1"
+const RAILS_TEST_STAGE_IMAGE = "ruby:3.2.1";
 
 const config: Config = {
   appName: "test-app",
@@ -14,9 +15,7 @@ const config: Config = {
         public: {
           RAILS_ENV: "production",
         },
-        secret: [
-          "SECRET_KEY_BASE",
-        ]
+        secret: ["SECRET_KEY_BASE"],
       },
       build: {
         type: "rails",
@@ -32,6 +31,7 @@ const config: Config = {
         audit: {
           jobImage: RAILS_TEST_STAGE_IMAGE,
         },
+        // only needed if you do not have a Dockerfile
         cnbBuilder: {
           buildVars: { SECRET_KEY_BASE: "dummy-value" },
         },
@@ -57,8 +57,7 @@ const config: Config = {
           jobs: {
             "db-migrate": {
               hook: "post-install,post-upgrade",
-              command:
-                "launcher bundle exec rake db:migrate",
+              command: "launcher bundle exec rake db:migrate",
             },
           },
         },
@@ -70,21 +69,19 @@ const config: Config = {
               jobs: {
                 "db-prepare-seed": {
                   hook: "post-install",
-                  command:
-                    "launcher bundle exec rake db:prepare db:seed",
+                  command: "launcher bundle exec rake db:prepare db:seed",
                 },
                 "db-migrate": {
                   hook: "post-upgrade",
-                  command:
-                    "launcher bundle exec rake db:migrate",
+                  command: "launcher bundle exec rake db:migrate",
                 },
               },
             },
           },
         },
         prod: {
-          host: "my-fancy-website.com"
-        }
+          host: "my-fancy-website.com",
+        },
       },
     },
   },
@@ -93,3 +90,9 @@ const config: Config = {
 it("matches snapshot", async () => {
   expect(await createAllPipelines(config)).toMatchSnapshot();
 });
+
+it("matches snapshot with a Dockerfile", async () => {
+  writeFileSync("Dockerfile", "");
+  expect(await createAllPipelines(config)).toMatchSnapshot();
+  rmSync("Dockerfile");
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@catladder/pipeline",
-  "version": "1.113.1",
+  "version": "1.114.0",
   "scripts": {
     "build:tsc": "yarn tsc",
     "build": "yarn build:compile && yarn build:inline-variables && yarn build:bundle",

package/src/build/docker.ts

@@ -3,6 +3,8 @@ import { isOfDeployType } from "../deploy";
 import { getRunnerImage } from "../runner";
 import type { Context } from "../types";
 import type { CatladderJob } from "../types/jobs";
+import { existsSync } from "fs";
+import path from "path";
 
 const DOCKER_RUNNER_BUILD_VARIABLES = {
   KUBERNETES_CPU_REQUEST: "0.5",
@@ -104,3 +106,6 @@ export const getDockerBuildDefaultScript = (ensureDockerFileScript?: string) =>
     "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
     "docker push $DOCKER_CACHE_IMAGE",
   ].filter(Boolean);
+
+export const hasDockerfile = (context: Context) =>
+  existsSync(path.join(context.componentConfig.dir, "Dockerfile"));

package/src/build/rails/build.ts

@@ -1,7 +1,11 @@
 import type { Context } from "../..";
 import type { CatladderJob } from "../../types/jobs";
 import { createBuildJobs } from "../base";
-import { gitlabDockerLogin } from "../docker";
+import {
+  getDockerBuildDefaultScript,
+  gitlabDockerLogin,
+  hasDockerfile,
+} from "../docker";
 import { isOfBuildType } from "../types";
 
 export const createRailsBuildJobs = (context: Context): CatladderJob[] => {
@@ -11,6 +15,16 @@ export const createRailsBuildJobs = (context: Context): CatladderJob[] => {
     throw new Error("build type is not rails");
   }
 
+  if (hasDockerfile(context)) {
+    return createBuildJobs(context, {
+      appBuild: undefined,
+      dockerBuild: {
+        script: getDockerBuildDefaultScript(),
+        variables: {},
+      },
+    });
+  }
+
   const cnbConf = buildConfig.cnbBuilder;
 
   const packEnvArgs = Object.entries(cnbConf?.buildVars ?? {})

package/src/build/types.ts

@@ -201,6 +201,11 @@ export type BuildConfigCustom = Omit<
 
 export 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.