@catladder/cli 0.0.0-pipeline-variables-377ff7da → 0.0.0-pipeline-variables-01ca5534

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/dist/bundles/catenv/index.js +9 -7
  2. package/dist/bundles/cli/index.js +9 -7
  3. package/package.json +2 -2
package/dist/bundles/catenv/index.js CHANGED
@@ -40034,7 +40034,7 @@ var path_1 = __importDefault(__nccwpck_require__(1017));
40034
40034
  var gitlab_1 = __nccwpck_require__(4997);
40035
40035
  var artifactsRegistry_1 = __nccwpck_require__(8159);
40036
40036
  var gcloudServiceAccountLoginCommands_1 = __nccwpck_require__(2607);
40037
- var DOCKER_RUNNER_BUILD_VARIABLES = {
40037
+ var DOCKER_BUILD_RUNNER_REQUESTS = {
40038
40038
  KUBERNETES_CPU_REQUEST: "0.5",
40039
40039
  KUBERNETES_MEMORY_REQUEST: "1Gi",
40040
40040
  KUBERNETES_MEMORY_LIMIT: "2Gi"
@@ -40065,7 +40065,8 @@ var requiresDockerBuild = function (_a) {
40065
40065
  return (0, deploy_1.isOfDeployType)(deploy, "kubernetes", "google-cloudrun", "dockerTag") || (0, deploy_1.isOfDeployType)(deploy, "custom") && deploy.requiresDocker;
40066
40066
  };
40067
40067
  exports.requiresDockerBuild = requiresDockerBuild;
40068
- var getDockerBaseVariables = function () {
40068
+ // those need to be runner variables
40069
+ var getDockerBuildRunnerVariables = function () {
40069
40070
  return {
40070
40071
  DOCKER_HOST: "tcp://0.0.0.0:2375",
40071
40072
  DOCKER_TLS_CERTDIR: "",
@@ -40075,12 +40076,12 @@ var getDockerBaseVariables = function () {
40075
40076
  };
40076
40077
  var getDockerBuildVariables = function (context) {
40077
40078
  var _a, _b, _c, _d;
40078
- return __assign(__assign({
40079
+ return __assign({
40079
40080
  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"),
40080
40081
  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"),
40081
40082
  APP_DIR: context.componentConfig.dir,
40082
40083
  DOCKER_DIR: "."
40083
- }, getDockerBaseVariables()), (0, exports.getDockerImageVariables)(context));
40084
+ }, (0, exports.getDockerImageVariables)(context));
40084
40085
  };
40085
40086
  exports.getDockerBuildVariables = getDockerBuildVariables;
40086
40087
  exports.DOCKER_BUILD_JOB_NAME = "🔨 docker";
@@ -40091,7 +40092,8 @@ var getDockerJobBaseProps = function (context) {
40091
40092
  name: "docker:24.0.6-dind",
40092
40093
  command: ["--tls=false"]
40093
40094
  }],
40094
- variables: getDockerBaseVariables()
40095
+ variables: {},
40096
+ runnerVariables: getDockerBuildRunnerVariables()
40095
40097
  };
40096
40098
  };
40097
40099
  exports.getDockerJobBaseProps = getDockerJobBaseProps;
@@ -40106,7 +40108,7 @@ var createDockerBuildJobBase = function (context, _a) {
40106
40108
  script: __spreadArray(["env"], __read(script || []), false)
40107
40109
  }), {
40108
40110
  variables: (0, exports.getDockerBuildVariables)(context),
40109
- runnerVariables: DOCKER_RUNNER_BUILD_VARIABLES
40111
+ runnerVariables: __assign(__assign({}, DOCKER_BUILD_RUNNER_REQUESTS), getDockerBuildRunnerVariables())
40110
40112
  }, def);
40111
40113
  };
40112
40114
  exports.createDockerBuildJobBase = createDockerBuildJobBase;
@@ -41209,7 +41211,7 @@ exports.readConfigSync = readConfigSync;
41209
41211
 
41210
41212
  exports.__esModule = true;
41211
41213
  exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
41212
- exports.PIPELINE_IMAGE_TAG = "pipeline-variables-377ff7da" || 0;
41214
+ exports.PIPELINE_IMAGE_TAG = "pipeline-variables-01ca5534" || 0;
41213
41215
  exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
41214
41216
 
41215
41217
  /***/ }),
package/dist/bundles/cli/index.js CHANGED
@@ -354966,7 +354966,7 @@ var path_1 = __importDefault(__nccwpck_require__(71017));
354966
354966
  var gitlab_1 = __nccwpck_require__(84997);
354967
354967
  var artifactsRegistry_1 = __nccwpck_require__(28159);
354968
354968
  var gcloudServiceAccountLoginCommands_1 = __nccwpck_require__(22607);
354969
- var DOCKER_RUNNER_BUILD_VARIABLES = {
354969
+ var DOCKER_BUILD_RUNNER_REQUESTS = {
354970
354970
  KUBERNETES_CPU_REQUEST: "0.5",
354971
354971
  KUBERNETES_MEMORY_REQUEST: "1Gi",
354972
354972
  KUBERNETES_MEMORY_LIMIT: "2Gi"
@@ -354997,7 +354997,8 @@ var requiresDockerBuild = function (_a) {
354997
354997
  return (0, deploy_1.isOfDeployType)(deploy, "kubernetes", "google-cloudrun", "dockerTag") || (0, deploy_1.isOfDeployType)(deploy, "custom") && deploy.requiresDocker;
354998
354998
  };
354999
354999
  exports.requiresDockerBuild = requiresDockerBuild;
355000
- var getDockerBaseVariables = function () {
355000
+ // those need to be runner variables
355001
+ var getDockerBuildRunnerVariables = function () {
355001
355002
  return {
355002
355003
  DOCKER_HOST: "tcp://0.0.0.0:2375",
355003
355004
  DOCKER_TLS_CERTDIR: "",
@@ -355007,12 +355008,12 @@ var getDockerBaseVariables = function () {
355007
355008
  };
355008
355009
  var getDockerBuildVariables = function (context) {
355009
355010
  var _a, _b, _c, _d;
355010
- return __assign(__assign({
355011
+ return __assign({
355011
355012
  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"),
355012
355013
  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"),
355013
355014
  APP_DIR: context.componentConfig.dir,
355014
355015
  DOCKER_DIR: "."
355015
- }, getDockerBaseVariables()), (0, exports.getDockerImageVariables)(context));
355016
+ }, (0, exports.getDockerImageVariables)(context));
355016
355017
  };
355017
355018
  exports.getDockerBuildVariables = getDockerBuildVariables;
355018
355019
  exports.DOCKER_BUILD_JOB_NAME = "🔨 docker";
@@ -355023,7 +355024,8 @@ var getDockerJobBaseProps = function (context) {
355023
355024
  name: "docker:24.0.6-dind",
355024
355025
  command: ["--tls=false"]
355025
355026
  }],
355026
- variables: getDockerBaseVariables()
355027
+ variables: {},
355028
+ runnerVariables: getDockerBuildRunnerVariables()
355027
355029
  };
355028
355030
  };
355029
355031
  exports.getDockerJobBaseProps = getDockerJobBaseProps;
@@ -355038,7 +355040,7 @@ var createDockerBuildJobBase = function (context, _a) {
355038
355040
  script: __spreadArray(["env"], __read(script || []), false)
355039
355041
  }), {
355040
355042
  variables: (0, exports.getDockerBuildVariables)(context),
355041
- runnerVariables: DOCKER_RUNNER_BUILD_VARIABLES
355043
+ runnerVariables: __assign(__assign({}, DOCKER_BUILD_RUNNER_REQUESTS), getDockerBuildRunnerVariables())
355042
355044
  }, def);
355043
355045
  };
355044
355046
  exports.createDockerBuildJobBase = createDockerBuildJobBase;
@@ -356141,7 +356143,7 @@ exports.readConfigSync = readConfigSync;
356141
356143
 
356142
356144
  exports.__esModule = true;
356143
356145
  exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
356144
- exports.PIPELINE_IMAGE_TAG = "pipeline-variables-377ff7da" || 0;
356146
+ exports.PIPELINE_IMAGE_TAG = "pipeline-variables-01ca5534" || 0;
356145
356147
  exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
356146
356148
 
356147
356149
  /***/ }),
package/package.json CHANGED
@@ -52,7 +52,7 @@
52
52
  }
53
53
  ],
54
54
  "license": "MIT",
55
- "version": "0.0.0-pipeline-variables-377ff7da",
55
+ "version": "0.0.0-pipeline-variables-01ca5534",
56
56
  "scripts": {
57
57
  "lint": "eslint \"src/**/*.ts\"",
58
58
  "lint:fix": "eslint \"src/**/*.ts\" --fix",
@@ -74,7 +74,7 @@
74
74
  "ts-node": "^10.9.1"
75
75
  },
76
76
  "devDependencies": {
77
- "@catladder/pipeline": "0.0.0-pipeline-variables-377ff7da",
77
+ "@catladder/pipeline": "0.0.0-pipeline-variables-01ca5534",
78
78
  "@gitbeaker/rest": "^39.28.0",
79
79
  "@kubernetes/client-node": "^0.16.2",
80
80
  "@tsconfig/node14": "^1.0.1",