@catladder/pipeline 0.0.0-fix-command-710f75f1 → 0.0.0-fix-error-sql-db-delete-a719775a

package/dist/build/custom/buildJob.js

@@ -64,6 +64,7 @@ var createCustomBuildJobs = function (context) {
   var appBuildJob = buildConfig.buildCommand !== null ? (0, createBuildJob_1.createBuildJob)(context, {
     image: buildConfig.jobImage,
     variables: __assign({}, RUNNER_BUILD_VARIABLES),
+    cache: buildConfig.jobCache,
     services: buildConfig.jobServices,
     script: __spreadArray([], __read((_a = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _a !== void 0 ? _a : []), false),
     artifacts: {

package/dist/build/docker.d.ts

@@ -16,14 +16,14 @@ export declare const getDockerBuildVariables: (context: Context) => {
   DOCKER_IMAGE_NAME: string;
   DOCKER_IMAGE: string;
   DOCKER_IMAGE_TAG: 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_HOST: string;
-  DOCKER_TLS_CERTDIR: string;
   DOCKER_DIR: string;
-  DOCKER_DRIVER: string;
   KUBERNETES_CPU_REQUEST: string;
   KUBERNETES_CPU_LIMIT: string;
   KUBERNETES_MEMORY_REQUEST: string;
@@ -37,24 +37,10 @@ export declare const getDockerJobBaseProps: (context: Context) => {
     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;
+    DOCKER_BUILDKIT: string;
   };
 };
 export declare const createDockerBuildJobBase: (context: Context, {

package/dist/build/docker.js

@@ -88,18 +88,22 @@ var requiresDockerBuild = function (context) {
   return false;
 };
 exports.requiresDockerBuild = requiresDockerBuild;
+var getDockerBaseVariables = function () {
+  return {
+    DOCKER_HOST: "tcp://0.0.0.0:2375",
+    DOCKER_TLS_CERTDIR: "",
+    DOCKER_DRIVER: "overlay2",
+    DOCKER_BUILDKIT: "1"
+  };
+};
 var getDockerBuildVariables = function (context) {
   var _a, _b, _c, _d;
-  return __assign(__assign(__assign({}, DOCKER_RUNNER_BUILD_VARIABLES), {
-    DOCKER_BUILDKIT: "1",
+  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"),
     APP_DIR: context.componentConfig.dir,
-    DOCKER_HOST: "tcp://0.0.0.0:2375",
-    DOCKER_TLS_CERTDIR: "",
-    DOCKER_DIR: ".",
-    DOCKER_DRIVER: "overlay2"
-  }), (0, exports.getDockerImageVariables)(context));
+    DOCKER_DIR: "."
+  }), getDockerBaseVariables()), (0, exports.getDockerImageVariables)(context));
 };
 exports.getDockerBuildVariables = getDockerBuildVariables;
 exports.DOCKER_BUILD_JOB_NAME = "🔨 docker";
@@ -110,7 +114,7 @@ var getDockerJobBaseProps = function (context) {
       name: "docker:20-dind",
       command: ["--tls=false"]
     }],
-    variables: (0, exports.getDockerBuildVariables)(context)
+    variables: getDockerBaseVariables()
   };
 };
 exports.getDockerJobBaseProps = getDockerJobBaseProps;
@@ -123,7 +127,9 @@ var createDockerBuildJobBase = function (context, _a) {
     stage: "build"
   }, (0, exports.getDockerJobBaseProps)(context)), {
     script: script || []
-  }), def);
+  }), {
+    variables: (0, exports.getDockerBuildVariables)(context)
+  }, def);
 };
 exports.createDockerBuildJobBase = createDockerBuildJobBase;
 exports.gitlabDockerLogin = "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY";

package/dist/build/index.js

@@ -65,7 +65,13 @@ exports.BUILD_TYPES = {
   rails: {
     jobs: rails_1.createRailsJobs,
     defaults: function () {
-      return {};
+      return {
+        startCommand: "/cnb/process/web",
+        cnbBuilder: {
+          image: "heroku/buildpacks:20",
+          packVersion: "0.28.0"
+        }
+      };
     }
   }
 };

package/dist/build/rails/build.js

@@ -1,30 +1,51 @@
 "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];
+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 t;
-  };
-  return __assign.apply(this, arguments);
+  }
+  return ar;
 };
 exports.__esModule = true;
 exports.createRailsBuildJobs = void 0;
+var types_1 = require("../types");
 var docker_1 = require("../docker");
 var createRailsBuildJobs = function (context) {
+  var _a, _b, _c;
+  var buildConfig = context.componentConfig.build;
+  if (!(0, types_1.isOfBuildType)(buildConfig, "rails")) {
+    // should not happen
+    throw new Error("build type is not rails");
+  }
+  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),
+      k = _b[0],
+      v = _b[1];
+    return "--env '".concat(k).concat(v ? "=".concat(v) : "", "'");
+  }).join(" ");
   return [(0, docker_1.createDockerBuildJobBase)(context, {
-    variables: __assign({
-      CNB_BUILDER: "heroku/buildpacks:18",
-      CNB_ENV_VARS: "BUNDLE_GIT__PANTER__CH",
-      CNB_EXTRA_ARGS: "",
-      CNB_PACK_VERSION: "0.20.0"
-    }, context.componentConfig.build.extraVars),
+    variables: 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$CNB_PACK_VERSION/pack-v$CNB_PACK_VERSION-linux.tgz | tar -zx --directory /usr/local/bin pack", "chmod +x /usr/local/bin/pack",
+    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",
     //  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", "for v in $CNB_ENV_VARS; do env_args=\"$env_args --env $v\"; done", "pack build $DOCKER_IMAGE:$DOCKER_IMAGE_TAG --builder $CNB_BUILDER --publish --cache-image $DOCKER_CACHE_IMAGE $env_args $CNB_EXTRA_ARGS"]
+    "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 : "")]
   })];
 };
 exports.createRailsBuildJobs = createRailsBuildJobs;

package/dist/build/rails/index.d.ts

@@ -1,3 +1,3 @@
-import { Context } from "../../types";
-import { CatladderJob } from "../../types/jobs";
+import type { Context } from "../../types";
+import type { CatladderJob } from "../../types/jobs";
 export declare const createRailsJobs: (context: Context) => CatladderJob[];

package/dist/build/rails/test.js

@@ -63,9 +63,8 @@ var createRailsTestJobs = function (context) {
   var bundlerCache = {
     key: {
       files: ["Gemfile.lock"],
-      prefix: "$CI_JOB_IMAGE" // a changed image might have different OS libraries which no longer work with the cached gems
+      prefix: "$CI_JOB_IMAGE"
     },
-
     paths: [bundlerCacheDir]
   };
   var auditJob = buildConfig.audit !== false ? __assign(__assign({

package/dist/build/types.d.ts

@@ -1,4 +1,5 @@
-import type { GitlabJobService } from "../types";
+import type { GitlabJobImage, GitlabJobService } from "../types";
+import type { CatladderJob } from "../types/jobs";
 export declare type BuildConfigBase = {
   /**
    * command to run on the image to start the app (e.g. yarn start)
@@ -24,21 +25,21 @@ export declare type BuildConfigBase = {
    */
   lint?: false | {
     command?: string | string[];
-    jobImage?: string;
+    jobImage?: GitlabJobImage;
   };
   /**
    * customize test, set false to disable
    */
   test?: false | {
     command?: string | string[];
-    jobImage?: string;
+    jobImage?: GitlabJobImage;
   };
   /**
    * customize audit, set false to disable
    */
   audit?: false | {
     command?: string | string[];
-    jobImage?: string;
+    jobImage?: GitlabJobImage;
   };
   /**
    * additional paths for artifacts,
@@ -91,9 +92,40 @@ export declare type BuildConfigCustom = BuildConfigBase & {
   jobImage: string;
   jobServices?: GitlabJobService[];
   docker: BuildConfigCustomDocker;
+  /**
+   * customize cache for the job
+   */
+  jobCache?: CatladderJob["cache"];
 };
 export declare type BuildConfigRails = BuildConfigBase & {
   type: "rails";
+  cnbBuilder?: {
+    /**
+     * The Cloud Native Buildpacks builder image to use.
+     * See e.g. https://github.com/heroku/builder or others.
+     * Default: heroku/buildpacks:20
+     */
+    image?: string;
+    /**
+     * The version of the Cloud Native Buildpacks pack command to use.
+     * See https://buildpacks.io/docs/tools/pack/
+     * Default: 0.28.0
+     */
+    packVersion?: string;
+    /**
+     * Additional command arguments passed to the pack command.
+     * See https://buildpacks.io/docs/tools/pack/
+     */
+    packExtraArgs?: string[];
+    /**
+     * Variables needed for Bundler and Rails asset precompilation.
+     *
+     * Specify a key with the value `undefined` to inherit it from the EnvVars.
+     *
+     * See https://github.com/rails/rails/issues/32947
+     */
+    buildVars?: Record<string, string | undefined>;
+  };
 };
 export declare type BuildConfigStorybook = BuildConfigNodeBase & {
   type: "storybook";