@catladder/pipeline 1.0.3 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@catladder/pipeline",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "scripts": {
     "build:tsc": "yarn tsc",
     "build": "yarn tsc && yarn build:inline-variables",

package/src/build/docker.ts

@@ -35,9 +35,13 @@ export const createDockerBuildJob = (
       DOCKER_DIR: ".", // relative to componentdir
       IMAGE_TAG: "$CI_COMMIT_SHA",
       DOCKER_DRIVER: "overlay2",
-      IMAGE_NAME: "$CI_REGISTRY_IMAGE/" + context.componentName,
-      CACHE_IMAGE:
-        "$CI_REGISTRY_IMAGE/" + context.componentName + "/cache:cache",
+      IMAGE_NAME:
+        "$CI_REGISTRY_IMAGE/" +
+        context.environment.shortName +
+        "/" +
+        context.componentName,
+
+      CACHE_IMAGE: "$CI_REGISTRY_IMAGE/caches/" + context.componentName,
     },
   };
 

package/src/deploy/kubernetes/deployJob.ts

@@ -83,6 +83,7 @@ export const createKubernetesDeployJobs = (context: Context): GitlabJobs => {
         HELM_ARGS: deployConfig.additionalHelmArgs,
         COMPONENT_NAME: context.componentName,
         // TODO: unify with docker build stage
+        IMAGE_NAME: context.environment.shortName + "/" + context.componentName,
         IMAGE_TAG: "$CI_COMMIT_SHA",
       },
     },

package/dist/build/base/constants.d.ts

@@ -1,7 +0,0 @@
-export declare const APP_BUILD_JOB_NAME = "\uD83D\uDD28 app";
-export declare const RUNNER_BUILD_RESOURCE_VARIABLES: {
-  KUBERNETES_CPU_REQUEST: string;
-  KUBERNETES_CPU_LIMIT: string;
-  KUBERNETES_MEMORY_REQUEST: string;
-  KUBERNETES_MEMORY_LIMIT: string;
-};

package/dist/build/base/constants.js

@@ -1,11 +0,0 @@
-"use strict";
-
-exports.__esModule = true;
-exports.RUNNER_BUILD_RESOURCE_VARIABLES = exports.APP_BUILD_JOB_NAME = void 0;
-exports.APP_BUILD_JOB_NAME = "🔨 app";
-exports.RUNNER_BUILD_RESOURCE_VARIABLES = {
-  KUBERNETES_CPU_REQUEST: "0.5",
-  KUBERNETES_CPU_LIMIT: "2",
-  KUBERNETES_MEMORY_REQUEST: "512Mi",
-  KUBERNETES_MEMORY_LIMIT: "2Gi"
-};

package/dist/build/base/createBuildJob.d.ts

@@ -1,5 +0,0 @@
-import { Context, GitlabJob, GitlabJobDef } from "../..";
-export declare const createBuildJob: (context: Context, {
-  script,
-  ...def
-}: Partial<GitlabJobDef>) => GitlabJob;

package/dist/build/base/createBuildJob.js

@@ -1,99 +0,0 @@
-"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];
-    }
-
-    return t;
-  };
-
-  return __assign.apply(this, arguments);
-};
-
-var __rest = this && this.__rest || function (s, e) {
-  var t = {};
-
-  for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
-
-  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
-  }
-  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));
-};
-
-exports.__esModule = true;
-exports.createBuildJob = void 0;
-
-var lodash_1 = require("lodash");
-
-var defaults_1 = require("../../defaults");
-
-var utils_1 = require("../../utils");
-
-var constants_1 = require("./constants");
-
-var createBuildJob = function (context, _a) {
-  var _b, _c;
-
-  var script = _a.script,
-      def = __rest(_a, ["script"]);
-
-  var buildInfo = [". getCommitInfo", "echo '{\"id\":\"'$BUILD_ID'\",\"commit\":\"'$BUILD_COMMIT'\",\"tag\":\"'$BUILD_TAG'\",\"time\":\"'$BUILD_TIME'\"}' > ".concat(context.componentConfig.dir, "/__build_info.json")];
-  return {
-    name: constants_1.APP_BUILD_JOB_NAME,
-    envMode: "jobPerEnv",
-    job: (0, lodash_1.merge)({
-      needs: [],
-      cache: [],
-      variables: __assign(__assign(__assign({}, constants_1.RUNNER_BUILD_RESOURCE_VARIABLES), context.environment.envVars), (_b = context.componentConfig.build.extraVars) !== null && _b !== void 0 ? _b : {}),
-      retry: defaults_1.BASE_RETRY,
-      interruptible: true,
-      stage: "build",
-      script: __spreadArray(__spreadArray(__spreadArray([], __read(buildInfo), false), ["cd ".concat(context.componentConfig.dir)], false), __read((_c = (0, utils_1.ensureArray)(script)) !== null && _c !== void 0 ? _c : []), false),
-      artifacts: {
-        paths: [context.componentConfig.dir + "/__build_info.json"]
-      }
-    }, def)
-  };
-};
-
-exports.createBuildJob = createBuildJob;

package/dist/build/docker.d.ts

@@ -1,5 +0,0 @@
-import { GitlabJobDef, Context } from "../types";
-export declare const DOCKER_BUILD_JOB_NAME = "\uD83D\uDD28 docker";
-export declare const createDockerBuildJob: (context: Context, {
-  script
-}: Pick<GitlabJobDef, "script">) => GitlabJobDef;

package/dist/build/docker.js

@@ -1,95 +0,0 @@
-"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];
-    }
-
-    return t;
-  };
-
-  return __assign.apply(this, arguments);
-};
-
-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));
-};
-
-exports.__esModule = true;
-exports.createDockerBuildJob = exports.DOCKER_BUILD_JOB_NAME = void 0;
-
-var runner_1 = require("../runner");
-
-var DOCKER_RUNNER_BUILD_VARIABLES = {
-  KUBERNETES_CPU_REQUEST: "0.5",
-  KUBERNETES_CPU_LIMIT: "1",
-  KUBERNETES_MEMORY_REQUEST: "1Gi",
-  KUBERNETES_MEMORY_LIMIT: "2Gi"
-};
-exports.DOCKER_BUILD_JOB_NAME = "🔨 docker";
-
-var createDockerBuildJob = function (context, _a) {
-  var _b, _c, _d, _e;
-
-  var script = _a.script;
-  var base = {
-    stage: "build",
-    image: (0, runner_1.getRunnerImage)("docker-build"),
-    interruptible: true,
-    services: [{
-      name: "docker:20-dind",
-      command: ["--tls=false"]
-    }],
-    variables: __assign(__assign({}, DOCKER_RUNNER_BUILD_VARIABLES), {
-      DOCKERFILE_ADDITIONS: (_c = (_b = context.componentConfig.build.docker) === null || _b === void 0 ? void 0 : _b.additionsBegin) === null || _c === void 0 ? void 0 : _c.join("\n"),
-      DOCKERFILE_ADDITIONS_END: (_e = (_d = context.componentConfig.build.docker) === null || _d === void 0 ? void 0 : _d.additionsEnd) === null || _e === void 0 ? void 0 : _e.join("\n"),
-      APP_DIR: context.componentConfig.dir,
-      DOCKER_HOST: "tcp://0.0.0.0:2375",
-      DOCKER_TLS_CERTDIR: "",
-      DOCKER_DIR: ".",
-      IMAGE_TAG: "$CI_COMMIT_SHA",
-      DOCKER_DRIVER: "overlay2",
-      IMAGE_NAME: "$CI_REGISTRY_IMAGE/" + context.componentName,
-      CACHE_IMAGE: "$CI_REGISTRY_IMAGE/" + context.componentName + "/cache:cache"
-    })
-  };
-  return __assign(__assign({}, base), {
-    script: __spreadArray(__spreadArray([], __read(script), false), ["docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY", "docker pull $CACHE_IMAGE || true", "docker build --network host --cache-from $CACHE_IMAGE --tag $IMAGE_NAME:$IMAGE_TAG -f $APP_DIR/Dockerfile .", "docker push $IMAGE_NAME:$IMAGE_TAG", "docker tag $IMAGE_NAME:$IMAGE_TAG $CACHE_IMAGE", "docker push $CACHE_IMAGE"], false)
-  });
-};
-
-exports.createDockerBuildJob = createDockerBuildJob;

package/dist/build/index.d.ts

@@ -1,12 +0,0 @@
-import { Context } from "../types/context";
-import { GitlabJobs } from "../types/gitlab-types";
-import { BuildConfig } from "./types";
-export * from "./types";
-export * from "./node";
-export declare type BuildTypes = { [type in BuildConfig["type"]]: {
-  jobs: (context: Context) => GitlabJobs;
-  defaults: () => Partial<Extract<BuildConfig, {
-    type: type;
-  }>>;
-} };
-export declare const BUILD_TYPES: BuildTypes;

package/dist/build/index.js

@@ -1,63 +0,0 @@
-"use strict";
-
-var __createBinding = this && this.__createBinding || (Object.create ? function (o, m, k, k2) {
-  if (k2 === undefined) k2 = k;
-  Object.defineProperty(o, k2, {
-    enumerable: true,
-    get: function () {
-      return m[k];
-    }
-  });
-} : function (o, m, k, k2) {
-  if (k2 === undefined) k2 = k;
-  o[k2] = m[k];
-});
-
-var __exportStar = this && this.__exportStar || function (m, exports) {
-  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-
-exports.__esModule = true;
-exports.BUILD_TYPES = void 0;
-
-var node_1 = require("./node");
-
-__exportStar(require("./types"), exports);
-
-__exportStar(require("./node"), exports);
-
-exports.BUILD_TYPES = {
-  node: {
-    jobs: node_1.createNodeJobs,
-    defaults: function () {
-      return {
-        buildCommand: "yarn build",
-        startCommand: "yarn start"
-      };
-    }
-  },
-  "node-static": {
-    jobs: node_1.createNodeJobs,
-    defaults: function () {
-      return {
-        buildCommand: "yarn build"
-      };
-    }
-  },
-  storybook: {
-    jobs: node_1.createStorybookJobs,
-    defaults: function () {
-      return {
-        buildCommand: ["yarn storybook", "mv ./storybook-out /dist"]
-      };
-    }
-  },
-  meteor: {
-    jobs: node_1.createMeteorJobs,
-    defaults: function () {
-      return {
-        startCommand: "node main.js"
-      };
-    }
-  }
-};

package/dist/build/node/buildJob.d.ts

@@ -1,3 +0,0 @@
-import { Context } from "../../types/context";
-import { GitlabJobs } from "../../types/gitlab-types";
-export declare const createNodeBuildJobs: (context: Context) => GitlabJobs;

package/dist/build/node/buildJob.js

@@ -1,97 +0,0 @@
-"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];
-    }
-
-    return t;
-  };
-
-  return __assign.apply(this, arguments);
-};
-
-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));
-};
-
-exports.__esModule = true;
-exports.createNodeBuildJobs = void 0;
-
-var utils_1 = require("../../utils");
-
-var constants_1 = require("../base/constants");
-
-var createBuildJob_1 = require("../base/createBuildJob");
-
-var docker_1 = require("../docker");
-
-var types_1 = require("../types");
-
-var cache_1 = require("./cache");
-
-var yarn_1 = require("./yarn");
-
-var createNodeBuildJobs = function (context) {
-  var _a;
-
-  var buildConfig = context.componentConfig.build;
-
-  if (!(0, types_1.isOfBuildType)(buildConfig, "node", "node-static", "storybook")) {
-    throw new Error("deploy config is not node, node-static or storybook");
-  }
-
-  var yarnInstall = (0, yarn_1.getYarnInstall)(context);
-  var appBuildJob = buildConfig.buildCommand !== null ? (0, createBuildJob_1.createBuildJob)(context, {
-    cache: __spreadArray(__spreadArray([], __read((0, cache_1.getNodeCache)(context)), false), __read((0, cache_1.getNextCache)(context)), false),
-    script: __spreadArray(__spreadArray([], __read(yarnInstall), false), __read((_a = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _a !== void 0 ? _a : []), false),
-    artifacts: {
-      paths: [context.componentConfig.dir + "/__build_info.json", context.componentConfig.dir + "/dist", context.componentConfig.dir + "/.next"]
-    }
-  }) : null;
-  return __spreadArray(__spreadArray([], __read(appBuildJob ? [appBuildJob] : []), false), [{
-    name: docker_1.DOCKER_BUILD_JOB_NAME,
-    envMode: "jobPerEnv",
-    job: __assign(__assign({}, (0, docker_1.createDockerBuildJob)(context, {
-      script: [buildConfig.type === "node-static" || buildConfig.type === "storybook" ? "ensureNginxDockerfile" : "ensureNodeDockerfile"]
-    })), {
-      needs: appBuildJob ? [constants_1.APP_BUILD_JOB_NAME] : []
-    })
-  }], false);
-};
-
-exports.createNodeBuildJobs = createNodeBuildJobs;

package/dist/build/node/cache.d.ts

@@ -1,4 +0,0 @@
-import { Context } from "../../types/context";
-import { GitlabJobCache } from "../../types/gitlab-types";
-export declare const getNodeCache: (context: Context) => GitlabJobCache[];
-export declare const getNextCache: (context: Context) => GitlabJobCache[];

package/dist/build/node/cache.js

@@ -1,67 +0,0 @@
-"use strict";
-
-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));
-};
-
-exports.__esModule = true;
-exports.getNextCache = exports.getNodeCache = void 0;
-
-var path_1 = require("path");
-
-var getNodeCache = function (context) {
-  var _a, _b, _c;
-
-  var componentIsInWorkspace = (_a = context.yarnInfo) === null || _a === void 0 ? void 0 : _a.componentIsInWorkspace;
-  return [{
-    // if component is in a shared workspace, use workspace cache. use individual cache else
-    key: componentIsInWorkspace ? "node-modules-workspace" : context.componentName + "-node-modules",
-    policy: "pull-push",
-    paths: __spreadArray([".yarn"], __read(componentIsInWorkspace ? __spreadArray(["node_modules"], __read((_c = (_b = context.yarnInfo) === null || _b === void 0 ? void 0 : _b.workspaces.map(function (w) {
-      return (0, path_1.join)(w.location, "node_modules");
-    })) !== null && _c !== void 0 ? _c : []), false) : [(0, path_1.join)(context.componentConfig.dir, "node_modules")]), false)
-  }];
-};
-
-exports.getNodeCache = getNodeCache;
-
-var getNextCache = function (context) {
-  return [{
-    key: context.componentName + "-next-cache",
-    policy: "pull-push",
-    paths: [context.componentConfig.dir + "/.next/cache/"]
-  }];
-};
-
-exports.getNextCache = getNextCache;

package/dist/build/node/constants.d.ts

@@ -1,6 +0,0 @@
-export declare const NODE_RUNNER_BUILD_VARIABLES: {
-  KUBERNETES_CPU_REQUEST: string;
-  KUBERNETES_CPU_LIMIT: string;
-  KUBERNETES_MEMORY_REQUEST: string;
-  KUBERNETES_MEMORY_LIMIT: string;
-};

package/dist/build/node/constants.js

@@ -1,10 +0,0 @@
-"use strict";
-
-exports.__esModule = true;
-exports.NODE_RUNNER_BUILD_VARIABLES = void 0;
-exports.NODE_RUNNER_BUILD_VARIABLES = {
-  KUBERNETES_CPU_REQUEST: "0.5",
-  KUBERNETES_CPU_LIMIT: "2",
-  KUBERNETES_MEMORY_REQUEST: "512Mi",
-  KUBERNETES_MEMORY_LIMIT: "2Gi"
-};

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

@@ -1,5 +0,0 @@
-import type { Context } from "../../types/context";
-import type { GitlabJobs } from "../../types/gitlab-types";
-export declare const createNodeJobs: (context: Context) => GitlabJobs;
-export declare const createStorybookJobs: (context: Context) => GitlabJobs;
-export declare const createMeteorJobs: (context: Context) => GitlabJobs;

package/dist/build/node/index.js

@@ -1,63 +0,0 @@
-"use strict";
-
-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));
-};
-
-exports.__esModule = true;
-exports.createMeteorJobs = exports.createStorybookJobs = exports.createNodeJobs = void 0;
-
-var buildJob_1 = require("./buildJob");
-
-var meteor_1 = require("./meteor");
-
-var testJob_1 = require("./testJob");
-
-var createNodeJobs = function (context) {
-  return __spreadArray(__spreadArray([], __read((0, testJob_1.createNodeTestJobs)(context)), false), __read((0, buildJob_1.createNodeBuildJobs)(context)), false);
-};
-
-exports.createNodeJobs = createNodeJobs;
-
-var createStorybookJobs = function (context) {
-  return __spreadArray([], __read((0, buildJob_1.createNodeBuildJobs)(context)), false);
-};
-
-exports.createStorybookJobs = createStorybookJobs;
-
-var createMeteorJobs = function (context) {
-  return __spreadArray(__spreadArray([], __read((0, testJob_1.createNodeTestJobs)(context)), false), __read((0, meteor_1.createMeteorBuildJobs)(context)), false);
-};
-
-exports.createMeteorJobs = createMeteorJobs;

package/dist/build/node/meteor.d.ts

@@ -1,3 +0,0 @@
-import type { Context } from "../../types/context";
-import type { GitlabJobs } from "../../types/gitlab-types";
-export declare const createMeteorBuildJobs: (context: Context) => GitlabJobs;