@catladder/pipeline 1.88.0 → 1.89.0
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/docker.d.ts +4 -18
- package/dist/build/docker.js +15 -9
- package/dist/bundles/catladder-gitlab/index.js +1 -1
- package/dist/constants.js +1 -1
- package/dist/deploy/kubernetes/kubeValues.d.ts +1 -0
- package/dist/deploy/kubernetes/kubeValues.js +9 -6
- package/dist/deploy/kubernetes/processSecretsAsFiles.d.ts +1 -0
- package/dist/deploy/types/kubernetes.d.ts +4 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/examples/__snapshots__/cloud-run-memory-limit.ts.snap +8 -20
- package/examples/__snapshots__/cloud-run-no-cpu-throttling.ts.snap +8 -20
- package/examples/__snapshots__/cloud-run-non-public.ts.snap +8 -20
- package/examples/__snapshots__/cloud-run-with-sql-reuse-db.ts.snap +16 -40
- package/examples/__snapshots__/cloud-run-with-sql.ts.snap +16 -40
- package/examples/__snapshots__/custom-build-job.ts.snap +8 -20
- package/examples/__snapshots__/kubernetes-application-customization.ts.snap +2280 -0
- package/examples/kubernetes-application-customization.ts +57 -0
- package/package.json +1 -1
- package/src/build/docker.ts +13 -6
- package/src/deploy/kubernetes/kubeValues.ts +7 -5
- package/src/deploy/types/kubernetes.ts +7 -2
package/dist/build/docker.d.ts
CHANGED
|
@@ -16,14 +16,14 @@ export declare const getDockerBuildVariables: (context: Context) => {
|
|
|
16
16
|
DOCKER_IMAGE_NAME: string;
|
|
17
17
|
DOCKER_IMAGE: string;
|
|
18
18
|
DOCKER_IMAGE_TAG: string;
|
|
19
|
+
DOCKER_HOST: string;
|
|
20
|
+
DOCKER_TLS_CERTDIR: string;
|
|
21
|
+
DOCKER_DRIVER: string;
|
|
19
22
|
DOCKER_BUILDKIT: string;
|
|
20
23
|
DOCKERFILE_ADDITIONS: string | undefined;
|
|
21
24
|
DOCKERFILE_ADDITIONS_END: string | undefined;
|
|
22
25
|
APP_DIR: string;
|
|
23
|
-
DOCKER_HOST: string;
|
|
24
|
-
DOCKER_TLS_CERTDIR: string;
|
|
25
26
|
DOCKER_DIR: string;
|
|
26
|
-
DOCKER_DRIVER: string;
|
|
27
27
|
KUBERNETES_CPU_REQUEST: string;
|
|
28
28
|
KUBERNETES_CPU_LIMIT: string;
|
|
29
29
|
KUBERNETES_MEMORY_REQUEST: string;
|
|
@@ -37,24 +37,10 @@ export declare const getDockerJobBaseProps: (context: Context) => {
|
|
|
37
37
|
command: string[];
|
|
38
38
|
}[];
|
|
39
39
|
variables: {
|
|
40
|
-
DOCKER_REGISTRY: string;
|
|
41
|
-
DOCKER_REGISTRY_IMAGE_PATH: string;
|
|
42
|
-
DOCKER_CACHE_IMAGE: string;
|
|
43
|
-
DOCKER_IMAGE_NAME: string;
|
|
44
|
-
DOCKER_IMAGE: string;
|
|
45
|
-
DOCKER_IMAGE_TAG: string;
|
|
46
|
-
DOCKER_BUILDKIT: string;
|
|
47
|
-
DOCKERFILE_ADDITIONS: string | undefined;
|
|
48
|
-
DOCKERFILE_ADDITIONS_END: string | undefined;
|
|
49
|
-
APP_DIR: string;
|
|
50
40
|
DOCKER_HOST: string;
|
|
51
41
|
DOCKER_TLS_CERTDIR: string;
|
|
52
|
-
DOCKER_DIR: string;
|
|
53
42
|
DOCKER_DRIVER: string;
|
|
54
|
-
|
|
55
|
-
KUBERNETES_CPU_LIMIT: string;
|
|
56
|
-
KUBERNETES_MEMORY_REQUEST: string;
|
|
57
|
-
KUBERNETES_MEMORY_LIMIT: string;
|
|
43
|
+
DOCKER_BUILDKIT: string;
|
|
58
44
|
};
|
|
59
45
|
};
|
|
60
46
|
export declare const createDockerBuildJobBase: (context: Context, {
|
package/dist/build/docker.js
CHANGED
|
@@ -88,18 +88,22 @@ var requiresDockerBuild = function (context) {
|
|
|
88
88
|
return false;
|
|
89
89
|
};
|
|
90
90
|
exports.requiresDockerBuild = requiresDockerBuild;
|
|
91
|
+
var getDockerBaseVariables = function () {
|
|
92
|
+
return {
|
|
93
|
+
DOCKER_HOST: "tcp://0.0.0.0:2375",
|
|
94
|
+
DOCKER_TLS_CERTDIR: "",
|
|
95
|
+
DOCKER_DRIVER: "overlay2",
|
|
96
|
+
DOCKER_BUILDKIT: "1"
|
|
97
|
+
};
|
|
98
|
+
};
|
|
91
99
|
var getDockerBuildVariables = function (context) {
|
|
92
100
|
var _a, _b, _c, _d;
|
|
93
|
-
return __assign(__assign(__assign({}, DOCKER_RUNNER_BUILD_VARIABLES), {
|
|
94
|
-
DOCKER_BUILDKIT: "1",
|
|
101
|
+
return __assign(__assign(__assign(__assign({}, DOCKER_RUNNER_BUILD_VARIABLES), {
|
|
95
102
|
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"),
|
|
96
103
|
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"),
|
|
97
104
|
APP_DIR: context.componentConfig.dir,
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
DOCKER_DIR: ".",
|
|
101
|
-
DOCKER_DRIVER: "overlay2"
|
|
102
|
-
}), (0, exports.getDockerImageVariables)(context));
|
|
105
|
+
DOCKER_DIR: "."
|
|
106
|
+
}), getDockerBaseVariables()), (0, exports.getDockerImageVariables)(context));
|
|
103
107
|
};
|
|
104
108
|
exports.getDockerBuildVariables = getDockerBuildVariables;
|
|
105
109
|
exports.DOCKER_BUILD_JOB_NAME = "🔨 docker";
|
|
@@ -110,7 +114,7 @@ var getDockerJobBaseProps = function (context) {
|
|
|
110
114
|
name: "docker:20-dind",
|
|
111
115
|
command: ["--tls=false"]
|
|
112
116
|
}],
|
|
113
|
-
variables: (
|
|
117
|
+
variables: getDockerBaseVariables()
|
|
114
118
|
};
|
|
115
119
|
};
|
|
116
120
|
exports.getDockerJobBaseProps = getDockerJobBaseProps;
|
|
@@ -123,7 +127,9 @@ var createDockerBuildJobBase = function (context, _a) {
|
|
|
123
127
|
stage: "build"
|
|
124
128
|
}, (0, exports.getDockerJobBaseProps)(context)), {
|
|
125
129
|
script: script || []
|
|
126
|
-
}),
|
|
130
|
+
}), {
|
|
131
|
+
variables: (0, exports.getDockerBuildVariables)(context)
|
|
132
|
+
}, def);
|
|
127
133
|
};
|
|
128
134
|
exports.createDockerBuildJobBase = createDockerBuildJobBase;
|
|
129
135
|
exports.gitlabDockerLogin = "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY";
|