@catladder/pipeline 1.75.4 → 1.75.5
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.
- package/dist/build/base/createBuildJob.js +5 -27
- package/dist/build/base/writeBuildInfo.js +0 -3
- package/dist/build/custom/buildJob.js +3 -23
- package/dist/build/custom/index.js +3 -10
- package/dist/build/docker.js +5 -40
- package/dist/build/index.js +0 -8
- package/dist/build/node/buildJob.js +3 -25
- package/dist/build/node/cache.js +3 -21
- package/dist/build/node/index.js +3 -16
- package/dist/build/node/meteor.js +3 -20
- package/dist/build/node/testJob.js +5 -22
- package/dist/build/node/yarn.js +5 -18
- package/dist/build/rails/build.js +2 -8
- package/dist/build/rails/index.js +3 -11
- package/dist/build/rails/test.js +5 -18
- package/dist/build/types.d.ts +0 -9
- package/dist/build/types.js +0 -4
- package/dist/bundles/catladder-gitlab/index.js +1 -1
- package/dist/catladder-gitlab.js +6 -24
- package/dist/config/{configruedEnvs.test.d.ts → __tests__/configruedEnvs.test.d.ts} +0 -0
- package/dist/config/{configruedEnvs.test.js → __tests__/configruedEnvs.test.js} +10 -12
- package/dist/config/configruedEnvs.js +7 -22
- package/dist/config/index.js +0 -4
- package/dist/config/readConfig.js +2 -13
- package/dist/constants.js +1 -1
- package/dist/context/{resolveReferences.test.d.ts → __tests__/resolveReferences.test.d.ts} +0 -0
- package/dist/context/{resolveReferences.test.js → __tests__/resolveReferences.test.js} +52 -103
- package/dist/context/getEnvConfig.js +0 -8
- package/dist/context/getEnvType.js +0 -5
- package/dist/context/getEnvironment.js +13 -49
- package/dist/context/getEnvironmentContext.js +0 -5
- package/dist/context/getEnvironmentVariables.js +20 -83
- package/dist/context/getLabels.js +2 -13
- package/dist/context/index.js +13 -58
- package/dist/context/resolveReferences.js +36 -126
- package/dist/deploy/base.js +4 -19
- package/dist/deploy/cloudRun/deployJob.js +19 -61
- package/dist/deploy/cloudRun/index.js +15 -37
- package/dist/deploy/cloudRun/utils/database.js +11 -29
- package/dist/deploy/cloudRun/utils/gcloudServiceAccountLoginCommands.js +0 -4
- package/dist/deploy/cloudRun/utils/jobName.js +0 -2
- package/dist/deploy/custom/deployJob.js +3 -18
- package/dist/deploy/custom/index.js +0 -2
- package/dist/deploy/dockerTag/deployJob.js +0 -9
- package/dist/deploy/dockerTag/index.js +0 -2
- package/dist/deploy/index.js +0 -11
- package/dist/deploy/kubernetes/additionalSecretKeys.js +0 -9
- package/dist/deploy/kubernetes/cloudSql/index.js +0 -12
- package/dist/deploy/kubernetes/deployJob.js +3 -24
- package/dist/deploy/kubernetes/index.js +7 -17
- package/dist/deploy/kubernetes/kubeEnv.d.ts +0 -1
- package/dist/deploy/kubernetes/kubeEnv.js +5 -23
- package/dist/deploy/kubernetes/kubeValues.js +6 -24
- package/dist/deploy/kubernetes/mongodb.js +0 -24
- package/dist/deploy/kubernetes/processSecretsAsFiles.js +2 -10
- package/dist/deploy/types/base.d.ts +0 -1
- package/dist/deploy/types/custom.d.ts +0 -6
- package/dist/deploy/types/googleCloudRun.d.ts +0 -12
- package/dist/deploy/types/index.js +0 -10
- package/dist/deploy/types/kubernetes.d.ts +0 -28
- package/dist/deploy/utils.js +0 -11
- package/dist/index.js +0 -10
- package/dist/pipeline/commitInfo/getBuildId.d.ts +1 -0
- package/dist/pipeline/{createChildPipeline.test.js → commitInfo/getBuildId.js} +25 -84
- package/dist/pipeline/commitInfo/getCommitInfo.d.ts +2 -0
- package/dist/{build/tests/storybook.test.js → pipeline/commitInfo/getCommitInfo.js} +30 -104
- package/dist/pipeline/createChildPipeline.js +19 -76
- package/dist/pipeline/createJobs.js +35 -135
- package/dist/pipeline/gitlab/makeGitlabJob.d.ts +1 -0
- package/dist/pipeline/gitlab/makeGitlabJob.js +13 -15
- package/dist/pipeline/index.js +0 -4
- package/dist/pipeline/packageManager.js +20 -173
- package/dist/pipeline/yarn/yarnUtils.d.ts +4 -0
- package/dist/pipeline/yarn/yarnUtils.js +193 -0
- package/dist/runner/index.js +0 -3
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/types/config.d.ts +0 -13
- package/dist/types/config.js +5 -15
- package/dist/types/context.d.ts +0 -2
- package/dist/types/environmentContext.d.ts +0 -1
- package/dist/types/gitlab-types.d.ts +0 -1
- package/dist/types/index.js +0 -6
- package/dist/types/jobs.d.ts +5 -15
- package/dist/utils/gitlab.js +3 -13
- package/dist/utils/index.js +5 -15
- package/examples/__snapshots__/cloud-run-with-sql.ts.snap +1765 -0
- package/examples/__snapshots__/custom-build-job.ts.snap +1174 -0
- package/examples/__snapshots__/custom-envs.ts.snap +261 -0
- package/examples/__snapshots__/wait-for-other-deploy.ts.snap +1626 -0
- package/examples/__utils__/helpers.ts +14 -0
- package/examples/{cloud-sql.ts → cloud-run-with-sql.ts} +11 -15
- package/examples/custom-build-job.ts +4 -1
- package/examples/custom-envs.ts +31 -0
- package/examples/wait-for-other-deploy.ts +36 -0
- package/package.json +2 -2
- package/src/config/{configruedEnvs.test.ts → __tests__/configruedEnvs.test.ts} +3 -3
- package/src/context/{resolveReferences.test.ts → __tests__/resolveReferences.test.ts} +3 -3
- package/src/pipeline/commitInfo/getBuildId.ts +6 -0
- package/src/pipeline/commitInfo/getCommitInfo.ts +12 -0
- package/src/pipeline/createChildPipeline.ts +6 -1
- package/src/pipeline/createJobs.ts +3 -10
- package/src/pipeline/gitlab/makeGitlabJob.ts +7 -1
- package/src/pipeline/packageManager.ts +4 -38
- package/src/pipeline/yarn/yarnUtils.ts +37 -0
- package/src/types/jobs.ts +2 -1
- package/tsconfig.json +1 -1
- package/dist/build/tests/storybook.test.d.ts +0 -1
- package/dist/pipeline/createChildPipeline.test.d.ts +0 -1
- package/src/build/tests/storybook.test.ts +0 -54
- package/src/pipeline/createChildPipeline.test.ts +0 -49
|
@@ -4,35 +4,27 @@ var __assign = this && this.__assign || function () {
|
|
|
4
4
|
__assign = Object.assign || function (t) {
|
|
5
5
|
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
6
6
|
s = arguments[i];
|
|
7
|
-
|
|
8
7
|
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
|
|
9
8
|
}
|
|
10
|
-
|
|
11
9
|
return t;
|
|
12
10
|
};
|
|
13
|
-
|
|
14
11
|
return __assign.apply(this, arguments);
|
|
15
12
|
};
|
|
16
|
-
|
|
17
13
|
var __rest = this && this.__rest || function (s, e) {
|
|
18
14
|
var t = {};
|
|
19
|
-
|
|
20
15
|
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
|
|
21
|
-
|
|
22
16
|
if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
|
|
23
17
|
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
|
|
24
18
|
}
|
|
25
19
|
return t;
|
|
26
20
|
};
|
|
27
|
-
|
|
28
21
|
var __read = this && this.__read || function (o, n) {
|
|
29
22
|
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
30
23
|
if (!m) return o;
|
|
31
24
|
var i = m.call(o),
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
25
|
+
r,
|
|
26
|
+
ar = [],
|
|
27
|
+
e;
|
|
36
28
|
try {
|
|
37
29
|
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
38
30
|
} catch (error) {
|
|
@@ -46,10 +38,8 @@ var __read = this && this.__read || function (o, n) {
|
|
|
46
38
|
if (e) throw e.error;
|
|
47
39
|
}
|
|
48
40
|
}
|
|
49
|
-
|
|
50
41
|
return ar;
|
|
51
42
|
};
|
|
52
|
-
|
|
53
43
|
var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
|
|
54
44
|
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
55
45
|
if (ar || !(i in from)) {
|
|
@@ -59,31 +49,20 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
|
|
|
59
49
|
}
|
|
60
50
|
return to.concat(ar || Array.prototype.slice.call(from));
|
|
61
51
|
};
|
|
62
|
-
|
|
63
52
|
exports.__esModule = true;
|
|
64
53
|
exports.createBuildJob = void 0;
|
|
65
|
-
|
|
66
54
|
var lodash_1 = require("lodash");
|
|
67
|
-
|
|
68
55
|
var path_1 = require("path");
|
|
69
|
-
|
|
70
56
|
var __1 = require("../..");
|
|
71
|
-
|
|
72
57
|
var utils_1 = require("../../utils");
|
|
73
|
-
|
|
74
58
|
var yarn_1 = require("../node/yarn");
|
|
75
|
-
|
|
76
59
|
var constants_1 = require("./constants");
|
|
77
|
-
|
|
78
60
|
var writeBuildInfo_1 = require("./writeBuildInfo");
|
|
79
|
-
|
|
80
61
|
var createBuildJob = function (context, _a) {
|
|
81
62
|
var _b, _c, _d, _e;
|
|
82
|
-
|
|
83
63
|
var script = _a.script,
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
64
|
+
variables = _a.variables,
|
|
65
|
+
def = __rest(_a, ["script", "variables"]);
|
|
87
66
|
return (0, lodash_1.merge)({
|
|
88
67
|
name: constants_1.APP_BUILD_JOB_NAME,
|
|
89
68
|
envMode: "jobPerEnv",
|
|
@@ -103,5 +82,4 @@ var createBuildJob = function (context, _a) {
|
|
|
103
82
|
}
|
|
104
83
|
}, def);
|
|
105
84
|
};
|
|
106
|
-
|
|
107
85
|
exports.createBuildJob = createBuildJob;
|
|
@@ -2,11 +2,8 @@
|
|
|
2
2
|
|
|
3
3
|
exports.__esModule = true;
|
|
4
4
|
exports.writeBuildInfo = void 0;
|
|
5
|
-
|
|
6
5
|
var writeBuildInfo = function (context) {
|
|
7
6
|
var _a, _b;
|
|
8
|
-
|
|
9
7
|
return ["echo '{\"id\":\"".concat((_a = context.commitInfo) === null || _a === void 0 ? void 0 : _a.buildId, "\",\"time\":\"").concat((_b = context.commitInfo) === null || _b === void 0 ? void 0 : _b.buildTime, "\"}' > ").concat(context.componentConfig.dir, "/__build_info.json")];
|
|
10
8
|
};
|
|
11
|
-
|
|
12
9
|
exports.writeBuildInfo = writeBuildInfo;
|
|
@@ -4,24 +4,19 @@ var __assign = this && this.__assign || function () {
|
|
|
4
4
|
__assign = Object.assign || function (t) {
|
|
5
5
|
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
6
6
|
s = arguments[i];
|
|
7
|
-
|
|
8
7
|
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
|
|
9
8
|
}
|
|
10
|
-
|
|
11
9
|
return t;
|
|
12
10
|
};
|
|
13
|
-
|
|
14
11
|
return __assign.apply(this, arguments);
|
|
15
12
|
};
|
|
16
|
-
|
|
17
13
|
var __read = this && this.__read || function (o, n) {
|
|
18
14
|
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
19
15
|
if (!m) return o;
|
|
20
16
|
var i = m.call(o),
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
17
|
+
r,
|
|
18
|
+
ar = [],
|
|
19
|
+
e;
|
|
25
20
|
try {
|
|
26
21
|
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
27
22
|
} catch (error) {
|
|
@@ -35,10 +30,8 @@ var __read = this && this.__read || function (o, n) {
|
|
|
35
30
|
if (e) throw e.error;
|
|
36
31
|
}
|
|
37
32
|
}
|
|
38
|
-
|
|
39
33
|
return ar;
|
|
40
34
|
};
|
|
41
|
-
|
|
42
35
|
var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
|
|
43
36
|
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
44
37
|
if (ar || !(i in from)) {
|
|
@@ -48,38 +41,26 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
|
|
|
48
41
|
}
|
|
49
42
|
return to.concat(ar || Array.prototype.slice.call(from));
|
|
50
43
|
};
|
|
51
|
-
|
|
52
44
|
exports.__esModule = true;
|
|
53
45
|
exports.createCustomBuildJobs = void 0;
|
|
54
|
-
|
|
55
46
|
var path_1 = require("path");
|
|
56
|
-
|
|
57
47
|
var utils_1 = require("../../utils");
|
|
58
|
-
|
|
59
48
|
var constants_1 = require("../base/constants");
|
|
60
|
-
|
|
61
49
|
var createBuildJob_1 = require("../base/createBuildJob");
|
|
62
|
-
|
|
63
50
|
var docker_1 = require("../docker");
|
|
64
|
-
|
|
65
51
|
var types_1 = require("../types");
|
|
66
|
-
|
|
67
52
|
var RUNNER_BUILD_VARIABLES = {
|
|
68
53
|
KUBERNETES_CPU_REQUEST: "0.5",
|
|
69
54
|
KUBERNETES_CPU_LIMIT: "2",
|
|
70
55
|
KUBERNETES_MEMORY_REQUEST: "2Gi",
|
|
71
56
|
KUBERNETES_MEMORY_LIMIT: "4Gi"
|
|
72
57
|
};
|
|
73
|
-
|
|
74
58
|
var createCustomBuildJobs = function (context) {
|
|
75
59
|
var _a, _b, _c, _d;
|
|
76
|
-
|
|
77
60
|
var buildConfig = context.componentConfig.build;
|
|
78
|
-
|
|
79
61
|
if (!(0, types_1.isOfBuildType)(buildConfig, "custom")) {
|
|
80
62
|
throw new Error("deploy config is not custom");
|
|
81
63
|
}
|
|
82
|
-
|
|
83
64
|
var appBuildJob = buildConfig.buildCommand !== null ? (0, createBuildJob_1.createBuildJob)(context, {
|
|
84
65
|
image: buildConfig.jobImage,
|
|
85
66
|
variables: __assign({}, RUNNER_BUILD_VARIABLES),
|
|
@@ -98,5 +79,4 @@ var createCustomBuildJobs = function (context) {
|
|
|
98
79
|
needs: appBuildJob ? [constants_1.APP_BUILD_JOB_NAME] : []
|
|
99
80
|
})] : []), false);
|
|
100
81
|
};
|
|
101
|
-
|
|
102
82
|
exports.createCustomBuildJobs = createCustomBuildJobs;
|
|
@@ -4,10 +4,9 @@ var __read = this && this.__read || function (o, n) {
|
|
|
4
4
|
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
5
5
|
if (!m) return o;
|
|
6
6
|
var i = m.call(o),
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
7
|
+
r,
|
|
8
|
+
ar = [],
|
|
9
|
+
e;
|
|
11
10
|
try {
|
|
12
11
|
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
13
12
|
} catch (error) {
|
|
@@ -21,10 +20,8 @@ var __read = this && this.__read || function (o, n) {
|
|
|
21
20
|
if (e) throw e.error;
|
|
22
21
|
}
|
|
23
22
|
}
|
|
24
|
-
|
|
25
23
|
return ar;
|
|
26
24
|
};
|
|
27
|
-
|
|
28
25
|
var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
|
|
29
26
|
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
30
27
|
if (ar || !(i in from)) {
|
|
@@ -34,14 +31,10 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
|
|
|
34
31
|
}
|
|
35
32
|
return to.concat(ar || Array.prototype.slice.call(from));
|
|
36
33
|
};
|
|
37
|
-
|
|
38
34
|
exports.__esModule = true;
|
|
39
35
|
exports.createCustomJobs = void 0;
|
|
40
|
-
|
|
41
36
|
var buildJob_1 = require("./buildJob");
|
|
42
|
-
|
|
43
37
|
var createCustomJobs = function (context) {
|
|
44
38
|
return __spreadArray([], __read((0, buildJob_1.createCustomBuildJobs)(context)), false);
|
|
45
39
|
};
|
|
46
|
-
|
|
47
40
|
exports.createCustomJobs = createCustomJobs;
|
package/dist/build/docker.js
CHANGED
|
@@ -4,35 +4,27 @@ var __assign = this && this.__assign || function () {
|
|
|
4
4
|
__assign = Object.assign || function (t) {
|
|
5
5
|
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
6
6
|
s = arguments[i];
|
|
7
|
-
|
|
8
7
|
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
|
|
9
8
|
}
|
|
10
|
-
|
|
11
9
|
return t;
|
|
12
10
|
};
|
|
13
|
-
|
|
14
11
|
return __assign.apply(this, arguments);
|
|
15
12
|
};
|
|
16
|
-
|
|
17
13
|
var __rest = this && this.__rest || function (s, e) {
|
|
18
14
|
var t = {};
|
|
19
|
-
|
|
20
15
|
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
|
|
21
|
-
|
|
22
16
|
if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
|
|
23
17
|
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
|
|
24
18
|
}
|
|
25
19
|
return t;
|
|
26
20
|
};
|
|
27
|
-
|
|
28
21
|
var __read = this && this.__read || function (o, n) {
|
|
29
22
|
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
30
23
|
if (!m) return o;
|
|
31
24
|
var i = m.call(o),
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
25
|
+
r,
|
|
26
|
+
ar = [],
|
|
27
|
+
e;
|
|
36
28
|
try {
|
|
37
29
|
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
38
30
|
} catch (error) {
|
|
@@ -46,10 +38,8 @@ var __read = this && this.__read || function (o, n) {
|
|
|
46
38
|
if (e) throw e.error;
|
|
47
39
|
}
|
|
48
40
|
}
|
|
49
|
-
|
|
50
41
|
return ar;
|
|
51
42
|
};
|
|
52
|
-
|
|
53
43
|
var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
|
|
54
44
|
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
55
45
|
if (ar || !(i in from)) {
|
|
@@ -59,23 +49,17 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
|
|
|
59
49
|
}
|
|
60
50
|
return to.concat(ar || Array.prototype.slice.call(from));
|
|
61
51
|
};
|
|
62
|
-
|
|
63
52
|
exports.__esModule = true;
|
|
64
53
|
exports.createDockerBuildJobDefault = exports.gitlabDockerLogin = exports.createDockerBuildJobBase = exports.getDockerJobBaseProps = exports.DOCKER_BUILD_JOB_NAME = exports.getDockerBuildVariables = exports.requiresDockerBuild = exports.getDockerImageVariables = void 0;
|
|
65
|
-
|
|
66
54
|
var lodash_1 = require("lodash");
|
|
67
|
-
|
|
68
55
|
var deploy_1 = require("../deploy");
|
|
69
|
-
|
|
70
56
|
var runner_1 = require("../runner");
|
|
71
|
-
|
|
72
57
|
var DOCKER_RUNNER_BUILD_VARIABLES = {
|
|
73
58
|
KUBERNETES_CPU_REQUEST: "0.5",
|
|
74
59
|
KUBERNETES_CPU_LIMIT: "1",
|
|
75
60
|
KUBERNETES_MEMORY_REQUEST: "1Gi",
|
|
76
61
|
KUBERNETES_MEMORY_LIMIT: "2Gi"
|
|
77
62
|
};
|
|
78
|
-
|
|
79
63
|
var getDockerImageVariables = function (context) {
|
|
80
64
|
return {
|
|
81
65
|
DOCKER_REGISTRY: "$CI_REGISTRY",
|
|
@@ -86,36 +70,26 @@ var getDockerImageVariables = function (context) {
|
|
|
86
70
|
DOCKER_IMAGE_TAG: "$CI_COMMIT_SHA"
|
|
87
71
|
};
|
|
88
72
|
};
|
|
89
|
-
|
|
90
73
|
exports.getDockerImageVariables = getDockerImageVariables;
|
|
91
|
-
|
|
92
74
|
var requiresDockerBuild = function (context) {
|
|
93
75
|
var deployConfig = context.componentConfig.deploy;
|
|
94
|
-
|
|
95
76
|
if ((0, deploy_1.isOfDeployType)(deployConfig, "kubernetes")) {
|
|
96
77
|
return true;
|
|
97
78
|
}
|
|
98
|
-
|
|
99
79
|
if ((0, deploy_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
|
|
100
80
|
return true;
|
|
101
81
|
}
|
|
102
|
-
|
|
103
82
|
if ((0, deploy_1.isOfDeployType)(deployConfig, "custom") && deployConfig.requiresDocker) {
|
|
104
83
|
return true;
|
|
105
84
|
}
|
|
106
|
-
|
|
107
85
|
if ((0, deploy_1.isOfDeployType)(deployConfig, "dockerTag")) {
|
|
108
86
|
return true;
|
|
109
87
|
}
|
|
110
|
-
|
|
111
88
|
return false;
|
|
112
89
|
};
|
|
113
|
-
|
|
114
90
|
exports.requiresDockerBuild = requiresDockerBuild;
|
|
115
|
-
|
|
116
91
|
var getDockerBuildVariables = function (context) {
|
|
117
92
|
var _a, _b, _c, _d;
|
|
118
|
-
|
|
119
93
|
return __assign(__assign(__assign({}, DOCKER_RUNNER_BUILD_VARIABLES), {
|
|
120
94
|
DOCKER_BUILDKIT: "1",
|
|
121
95
|
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"),
|
|
@@ -127,10 +101,8 @@ var getDockerBuildVariables = function (context) {
|
|
|
127
101
|
DOCKER_DRIVER: "overlay2"
|
|
128
102
|
}), (0, exports.getDockerImageVariables)(context));
|
|
129
103
|
};
|
|
130
|
-
|
|
131
104
|
exports.getDockerBuildVariables = getDockerBuildVariables;
|
|
132
105
|
exports.DOCKER_BUILD_JOB_NAME = "🔨 docker";
|
|
133
|
-
|
|
134
106
|
var getDockerJobBaseProps = function (context) {
|
|
135
107
|
return {
|
|
136
108
|
image: (0, runner_1.getRunnerImage)("docker-build"),
|
|
@@ -141,13 +113,10 @@ var getDockerJobBaseProps = function (context) {
|
|
|
141
113
|
variables: (0, exports.getDockerBuildVariables)(context)
|
|
142
114
|
};
|
|
143
115
|
};
|
|
144
|
-
|
|
145
116
|
exports.getDockerJobBaseProps = getDockerJobBaseProps;
|
|
146
|
-
|
|
147
117
|
var createDockerBuildJobBase = function (context, _a) {
|
|
148
118
|
var script = _a.script,
|
|
149
|
-
|
|
150
|
-
|
|
119
|
+
def = __rest(_a, ["script"]);
|
|
151
120
|
return (0, lodash_1.merge)(__assign(__assign({
|
|
152
121
|
name: exports.DOCKER_BUILD_JOB_NAME,
|
|
153
122
|
envMode: "jobPerEnv",
|
|
@@ -156,17 +125,13 @@ var createDockerBuildJobBase = function (context, _a) {
|
|
|
156
125
|
script: script || []
|
|
157
126
|
}), def);
|
|
158
127
|
};
|
|
159
|
-
|
|
160
128
|
exports.createDockerBuildJobBase = createDockerBuildJobBase;
|
|
161
129
|
exports.gitlabDockerLogin = "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY";
|
|
162
|
-
|
|
163
130
|
var createDockerBuildJobDefault = function (context, _a) {
|
|
164
131
|
var script = _a.script,
|
|
165
|
-
|
|
166
|
-
|
|
132
|
+
def = __rest(_a, ["script"]);
|
|
167
133
|
return (0, exports.createDockerBuildJobBase)(context, __assign({
|
|
168
134
|
script: __spreadArray(__spreadArray([], __read(script || []), false), [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"], false)
|
|
169
135
|
}, def));
|
|
170
136
|
};
|
|
171
|
-
|
|
172
137
|
exports.createDockerBuildJobDefault = createDockerBuildJobDefault;
|
package/dist/build/index.js
CHANGED
|
@@ -12,24 +12,16 @@ var __createBinding = this && this.__createBinding || (Object.create ? function
|
|
|
12
12
|
if (k2 === undefined) k2 = k;
|
|
13
13
|
o[k2] = m[k];
|
|
14
14
|
});
|
|
15
|
-
|
|
16
15
|
var __exportStar = this && this.__exportStar || function (m, exports) {
|
|
17
16
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
18
17
|
};
|
|
19
|
-
|
|
20
18
|
exports.__esModule = true;
|
|
21
19
|
exports.BUILD_TYPES = void 0;
|
|
22
|
-
|
|
23
20
|
var custom_1 = require("./custom");
|
|
24
|
-
|
|
25
21
|
var node_1 = require("./node");
|
|
26
|
-
|
|
27
22
|
var rails_1 = require("./rails");
|
|
28
|
-
|
|
29
23
|
__exportStar(require("./types"), exports);
|
|
30
|
-
|
|
31
24
|
__exportStar(require("./node"), exports);
|
|
32
|
-
|
|
33
25
|
exports.BUILD_TYPES = {
|
|
34
26
|
node: {
|
|
35
27
|
jobs: node_1.createNodeJobs,
|
|
@@ -4,24 +4,19 @@ var __assign = this && this.__assign || function () {
|
|
|
4
4
|
__assign = Object.assign || function (t) {
|
|
5
5
|
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
6
6
|
s = arguments[i];
|
|
7
|
-
|
|
8
7
|
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
|
|
9
8
|
}
|
|
10
|
-
|
|
11
9
|
return t;
|
|
12
10
|
};
|
|
13
|
-
|
|
14
11
|
return __assign.apply(this, arguments);
|
|
15
12
|
};
|
|
16
|
-
|
|
17
13
|
var __read = this && this.__read || function (o, n) {
|
|
18
14
|
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
19
15
|
if (!m) return o;
|
|
20
16
|
var i = m.call(o),
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
17
|
+
r,
|
|
18
|
+
ar = [],
|
|
19
|
+
e;
|
|
25
20
|
try {
|
|
26
21
|
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
27
22
|
} catch (error) {
|
|
@@ -35,10 +30,8 @@ var __read = this && this.__read || function (o, n) {
|
|
|
35
30
|
if (e) throw e.error;
|
|
36
31
|
}
|
|
37
32
|
}
|
|
38
|
-
|
|
39
33
|
return ar;
|
|
40
34
|
};
|
|
41
|
-
|
|
42
35
|
var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
|
|
43
36
|
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
44
37
|
if (ar || !(i in from)) {
|
|
@@ -48,37 +41,23 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
|
|
|
48
41
|
}
|
|
49
42
|
return to.concat(ar || Array.prototype.slice.call(from));
|
|
50
43
|
};
|
|
51
|
-
|
|
52
44
|
exports.__esModule = true;
|
|
53
45
|
exports.createNodeBuildJobs = void 0;
|
|
54
|
-
|
|
55
46
|
var utils_1 = require("../../utils");
|
|
56
|
-
|
|
57
47
|
var constants_1 = require("../base/constants");
|
|
58
|
-
|
|
59
48
|
var createBuildJob_1 = require("../base/createBuildJob");
|
|
60
|
-
|
|
61
49
|
var docker_1 = require("../docker");
|
|
62
|
-
|
|
63
50
|
var path_1 = require("path");
|
|
64
|
-
|
|
65
51
|
var types_1 = require("../types");
|
|
66
|
-
|
|
67
52
|
var cache_1 = require("./cache");
|
|
68
|
-
|
|
69
53
|
var constants_2 = require("./constants");
|
|
70
|
-
|
|
71
54
|
var yarn_1 = require("./yarn");
|
|
72
|
-
|
|
73
55
|
var createNodeBuildJobs = function (context) {
|
|
74
56
|
var _a, _b, _c, _d, _e;
|
|
75
|
-
|
|
76
57
|
var buildConfig = context.componentConfig.build;
|
|
77
|
-
|
|
78
58
|
if (!(0, types_1.isOfBuildType)(buildConfig, "node", "node-static", "storybook")) {
|
|
79
59
|
throw new Error("deploy config is not node, node-static or storybook");
|
|
80
60
|
}
|
|
81
|
-
|
|
82
61
|
var yarnInstall = (0, yarn_1.getYarnInstall)(context);
|
|
83
62
|
var appBuildJob = buildConfig.buildCommand !== null ? (0, createBuildJob_1.createBuildJob)(context, {
|
|
84
63
|
variables: __assign({}, constants_2.NODE_RUNNER_BUILD_VARIABLES),
|
|
@@ -109,5 +88,4 @@ var createNodeBuildJobs = function (context) {
|
|
|
109
88
|
needs: appBuildJob ? [constants_1.APP_BUILD_JOB_NAME] : []
|
|
110
89
|
})] : []), false);
|
|
111
90
|
};
|
|
112
|
-
|
|
113
91
|
exports.createNodeBuildJobs = createNodeBuildJobs;
|
package/dist/build/node/cache.js
CHANGED
|
@@ -4,10 +4,9 @@ var __read = this && this.__read || function (o, n) {
|
|
|
4
4
|
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
5
5
|
if (!m) return o;
|
|
6
6
|
var i = m.call(o),
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
7
|
+
r,
|
|
8
|
+
ar = [],
|
|
9
|
+
e;
|
|
11
10
|
try {
|
|
12
11
|
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
13
12
|
} catch (error) {
|
|
@@ -21,10 +20,8 @@ var __read = this && this.__read || function (o, n) {
|
|
|
21
20
|
if (e) throw e.error;
|
|
22
21
|
}
|
|
23
22
|
}
|
|
24
|
-
|
|
25
23
|
return ar;
|
|
26
24
|
};
|
|
27
|
-
|
|
28
25
|
var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
|
|
29
26
|
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
30
27
|
if (ar || !(i in from)) {
|
|
@@ -34,19 +31,14 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
|
|
|
34
31
|
}
|
|
35
32
|
return to.concat(ar || Array.prototype.slice.call(from));
|
|
36
33
|
};
|
|
37
|
-
|
|
38
34
|
exports.__esModule = true;
|
|
39
35
|
exports.getNextCache = exports.getNodeCache = exports.getNodeModulesCache = exports.getYarnCache = void 0;
|
|
40
|
-
|
|
41
36
|
var path_1 = require("path");
|
|
42
|
-
|
|
43
37
|
var getYarnCache = function (context, policy) {
|
|
44
38
|
var _a;
|
|
45
|
-
|
|
46
39
|
if (policy === void 0) {
|
|
47
40
|
policy = "pull-push";
|
|
48
41
|
}
|
|
49
|
-
|
|
50
42
|
var componentIsInWorkspace = (_a = context.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.componentIsInWorkspace;
|
|
51
43
|
return [componentIsInWorkspace ? {
|
|
52
44
|
key: "yarn",
|
|
@@ -58,16 +50,12 @@ var getYarnCache = function (context, policy) {
|
|
|
58
50
|
paths: [(0, path_1.join)(context.componentConfig.dir, ".yarn")]
|
|
59
51
|
}];
|
|
60
52
|
};
|
|
61
|
-
|
|
62
53
|
exports.getYarnCache = getYarnCache;
|
|
63
|
-
|
|
64
54
|
var getNodeModulesCache = function (context, policy) {
|
|
65
55
|
var _a, _b, _c;
|
|
66
|
-
|
|
67
56
|
if (policy === void 0) {
|
|
68
57
|
policy = "pull-push";
|
|
69
58
|
}
|
|
70
|
-
|
|
71
59
|
var componentIsInWorkspace = (_a = context.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.componentIsInWorkspace;
|
|
72
60
|
return [{
|
|
73
61
|
// if component is in a shared workspace, use workspace cache. use individual cache else
|
|
@@ -78,19 +66,14 @@ var getNodeModulesCache = function (context, policy) {
|
|
|
78
66
|
})) !== null && _c !== void 0 ? _c : []), false) : [(0, path_1.join)(context.componentConfig.dir, "node_modules")]), false)
|
|
79
67
|
}];
|
|
80
68
|
};
|
|
81
|
-
|
|
82
69
|
exports.getNodeModulesCache = getNodeModulesCache;
|
|
83
|
-
|
|
84
70
|
var getNodeCache = function (context, policy) {
|
|
85
71
|
if (policy === void 0) {
|
|
86
72
|
policy = "pull-push";
|
|
87
73
|
}
|
|
88
|
-
|
|
89
74
|
return __spreadArray(__spreadArray([], __read((0, exports.getYarnCache)(context, policy)), false), __read((0, exports.getNodeModulesCache)(context, policy)), false);
|
|
90
75
|
};
|
|
91
|
-
|
|
92
76
|
exports.getNodeCache = getNodeCache;
|
|
93
|
-
|
|
94
77
|
var getNextCache = function (context) {
|
|
95
78
|
return [{
|
|
96
79
|
key: context.componentName + "-next-cache",
|
|
@@ -98,5 +81,4 @@ var getNextCache = function (context) {
|
|
|
98
81
|
paths: [context.componentConfig.dir + "/.next/cache/"]
|
|
99
82
|
}];
|
|
100
83
|
};
|
|
101
|
-
|
|
102
84
|
exports.getNextCache = getNextCache;
|
package/dist/build/node/index.js
CHANGED
|
@@ -4,10 +4,9 @@ var __read = this && this.__read || function (o, n) {
|
|
|
4
4
|
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
5
5
|
if (!m) return o;
|
|
6
6
|
var i = m.call(o),
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
7
|
+
r,
|
|
8
|
+
ar = [],
|
|
9
|
+
e;
|
|
11
10
|
try {
|
|
12
11
|
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
13
12
|
} catch (error) {
|
|
@@ -21,10 +20,8 @@ var __read = this && this.__read || function (o, n) {
|
|
|
21
20
|
if (e) throw e.error;
|
|
22
21
|
}
|
|
23
22
|
}
|
|
24
|
-
|
|
25
23
|
return ar;
|
|
26
24
|
};
|
|
27
|
-
|
|
28
25
|
var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
|
|
29
26
|
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
30
27
|
if (ar || !(i in from)) {
|
|
@@ -34,30 +31,20 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
|
|
|
34
31
|
}
|
|
35
32
|
return to.concat(ar || Array.prototype.slice.call(from));
|
|
36
33
|
};
|
|
37
|
-
|
|
38
34
|
exports.__esModule = true;
|
|
39
35
|
exports.createMeteorJobs = exports.createStorybookJobs = exports.createNodeJobs = void 0;
|
|
40
|
-
|
|
41
36
|
var buildJob_1 = require("./buildJob");
|
|
42
|
-
|
|
43
37
|
var meteor_1 = require("./meteor");
|
|
44
|
-
|
|
45
38
|
var testJob_1 = require("./testJob");
|
|
46
|
-
|
|
47
39
|
var createNodeJobs = function (context) {
|
|
48
40
|
return __spreadArray(__spreadArray([], __read((0, testJob_1.createNodeTestJobs)(context)), false), __read((0, buildJob_1.createNodeBuildJobs)(context)), false);
|
|
49
41
|
};
|
|
50
|
-
|
|
51
42
|
exports.createNodeJobs = createNodeJobs;
|
|
52
|
-
|
|
53
43
|
var createStorybookJobs = function (context) {
|
|
54
44
|
return __spreadArray([], __read((0, buildJob_1.createNodeBuildJobs)(context)), false);
|
|
55
45
|
};
|
|
56
|
-
|
|
57
46
|
exports.createStorybookJobs = createStorybookJobs;
|
|
58
|
-
|
|
59
47
|
var createMeteorJobs = function (context) {
|
|
60
48
|
return __spreadArray(__spreadArray([], __read((0, testJob_1.createNodeTestJobs)(context)), false), __read((0, meteor_1.createMeteorBuildJobs)(context)), false);
|
|
61
49
|
};
|
|
62
|
-
|
|
63
50
|
exports.createMeteorJobs = createMeteorJobs;
|