@git.zone/cli 3.0.2 → 3.1.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_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/helpers.tsdocker.d.ts +3 -0
- package/dist_ts/helpers.tsdocker.js +16 -0
- package/dist_ts/helpers.workflow.d.ts +6 -0
- package/dist_ts/helpers.workflow.js +38 -1
- package/dist_ts/mod_config/index.js +77 -7
- package/dist_ts/mod_release/index.d.ts +4 -0
- package/dist_ts/mod_release/index.js +50 -4
- package/package.json +1 -1
- package/readme.md +19 -1
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/helpers.tsdocker.ts +30 -0
- package/ts/helpers.workflow.ts +46 -0
- package/ts/mod_config/index.ts +95 -7
- package/ts/mod_release/index.ts +65 -2
|
@@ -3,8 +3,9 @@ import * as paths from "../paths.js";
|
|
|
3
3
|
import { logger } from "../gitzone.logging.js";
|
|
4
4
|
import { getCliMode, printJson } from "../helpers.climode.js";
|
|
5
5
|
import { inferVersionTypeFromPending, movePendingToVersion, readPendingChangelog, } from "../helpers.changelog.js";
|
|
6
|
-
import { resolveReleaseWorkflow, } from "../helpers.workflow.js";
|
|
6
|
+
import { getDeclaredTsdockerRange, resolveReleaseWorkflow, supportsBoundedBuildRegistryAuthentication, } from "../helpers.workflow.js";
|
|
7
7
|
import * as commitHelpers from "../mod_commit/mod.helpers.js";
|
|
8
|
+
import { hasInstalledProjectTsdockerBinary } from "../helpers.tsdocker.js";
|
|
8
9
|
export const run = async (argvArg) => {
|
|
9
10
|
const mode = await getCliMode(argvArg);
|
|
10
11
|
const subcommand = argvArg._?.[1];
|
|
@@ -188,6 +189,38 @@ async function runDockerTarget(smartshellInstance, workflow) {
|
|
|
188
189
|
if (!workflow.dockerEnabled) {
|
|
189
190
|
return [{ target: "docker", status: "skipped", message: "disabled" }];
|
|
190
191
|
}
|
|
192
|
+
let packageJson;
|
|
193
|
+
try {
|
|
194
|
+
packageJson = JSON.parse(await plugins.fs.readFile(plugins.path.join(paths.cwd, "package.json"), "utf8"));
|
|
195
|
+
}
|
|
196
|
+
catch {
|
|
197
|
+
packageJson = undefined;
|
|
198
|
+
}
|
|
199
|
+
if (!getDeclaredTsdockerRange(packageJson)) {
|
|
200
|
+
return [{
|
|
201
|
+
target: "tsdocker",
|
|
202
|
+
status: "failed",
|
|
203
|
+
message: "Docker releases require @git.zone/tsdocker as a project dependency",
|
|
204
|
+
}];
|
|
205
|
+
}
|
|
206
|
+
if (!(await hasInstalledProjectTsdockerBinary(paths.cwd))) {
|
|
207
|
+
return [{
|
|
208
|
+
target: "tsdocker",
|
|
209
|
+
status: "failed",
|
|
210
|
+
message: "Docker releases require the installed project-local tSDocker binary",
|
|
211
|
+
}];
|
|
212
|
+
}
|
|
213
|
+
if (workflow.dockerBuildRegistries.length > 0) {
|
|
214
|
+
const versionResult = await smartshellInstance.exec("pnpm exec tsdocker --version");
|
|
215
|
+
if (versionResult.exitCode !== 0
|
|
216
|
+
|| !supportsBoundedBuildRegistryAuthentication(versionResult.combinedOutput)) {
|
|
217
|
+
return [{
|
|
218
|
+
target: "tsdocker",
|
|
219
|
+
status: "failed",
|
|
220
|
+
message: "release.targets.docker.buildRegistries requires project-local @git.zone/tsdocker >= 3.3.0",
|
|
221
|
+
}];
|
|
222
|
+
}
|
|
223
|
+
}
|
|
191
224
|
const command = buildTsdockerPushCommand(workflow);
|
|
192
225
|
const result = await smartshellInstance.exec(command);
|
|
193
226
|
const output = result.combinedOutput;
|
|
@@ -199,8 +232,14 @@ async function runDockerTarget(smartshellInstance, workflow) {
|
|
|
199
232
|
message: result.exitCode === 0 ? undefined : firstMeaningfulLine(output),
|
|
200
233
|
}];
|
|
201
234
|
}
|
|
202
|
-
function buildTsdockerPushCommand(workflow) {
|
|
203
|
-
const commandParts = ["tsdocker", "push"];
|
|
235
|
+
export function buildTsdockerPushCommand(workflow) {
|
|
236
|
+
const commandParts = ["pnpm", "exec", "tsdocker", "push"];
|
|
237
|
+
if (workflow.dockerRegistry) {
|
|
238
|
+
commandParts.push(`--registry=${shellQuote(workflow.dockerRegistry)}`);
|
|
239
|
+
}
|
|
240
|
+
if (workflow.dockerBuildRegistries.length > 0) {
|
|
241
|
+
commandParts.push(`--build-registries=${shellQuote(workflow.dockerBuildRegistries.join(","))}`);
|
|
242
|
+
}
|
|
204
243
|
if (workflow.dockerNoBuild) {
|
|
205
244
|
commandParts.push("--no-build");
|
|
206
245
|
}
|
|
@@ -245,6 +284,8 @@ function printReleasePlan(workflow) {
|
|
|
245
284
|
}
|
|
246
285
|
if (workflow.targets.includes("docker")) {
|
|
247
286
|
console.log(`docker engine: ${workflow.dockerEngine}`);
|
|
287
|
+
console.log(`docker registry: ${workflow.dockerRegistry || "all configured registries"}`);
|
|
288
|
+
console.log(`docker build authentication: ${workflow.dockerBuildRegistries.length > 0 ? workflow.dockerBuildRegistries.join(", ") : "all configured registries"}`);
|
|
248
289
|
console.log(`docker patterns: ${workflow.dockerPatterns.length > 0 ? workflow.dockerPatterns.join(", ") : "all Dockerfiles"}`);
|
|
249
290
|
console.log(`docker options: ${formatDockerOptions(workflow)}`);
|
|
250
291
|
}
|
|
@@ -252,6 +293,11 @@ function printReleasePlan(workflow) {
|
|
|
252
293
|
}
|
|
253
294
|
function formatDockerOptions(workflow) {
|
|
254
295
|
const options = [];
|
|
296
|
+
if (workflow.dockerRegistry)
|
|
297
|
+
options.push(`registry=${workflow.dockerRegistry}`);
|
|
298
|
+
if (workflow.dockerBuildRegistries.length > 0) {
|
|
299
|
+
options.push(`buildRegistries=${workflow.dockerBuildRegistries.join(",")}`);
|
|
300
|
+
}
|
|
255
301
|
if (workflow.dockerCached)
|
|
256
302
|
options.push("cached");
|
|
257
303
|
if (workflow.dockerParallel)
|
|
@@ -323,4 +369,4 @@ export function showHelp(mode) {
|
|
|
323
369
|
console.log(" --plan Show resolved workflow without mutating files");
|
|
324
370
|
console.log("");
|
|
325
371
|
}
|
|
326
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../ts/mod_release/index.ts"],"names":[],"mappings":"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"}
|
|
372
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../ts/mod_release/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@git.zone/cli",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "3.0
|
|
4
|
+
"version": "3.1.0",
|
|
5
5
|
"description": "A comprehensive CLI tool for enhancing and managing local development workflows with gitzone utilities, focusing on project setup, version control, code formatting, and template management.",
|
|
6
6
|
"main": "dist_ts/index.js",
|
|
7
7
|
"typings": "dist_ts/index.d.ts",
|
package/readme.md
CHANGED
|
@@ -243,6 +243,8 @@ CLI workflow config lives under `@git.zone/cli` in `.smartconfig.json`. Docker b
|
|
|
243
243
|
"docker": {
|
|
244
244
|
"enabled": true,
|
|
245
245
|
"engine": "tsdocker",
|
|
246
|
+
"registry": "registry.gitlab.com",
|
|
247
|
+
"buildRegistries": ["registry.gitlab.com"],
|
|
246
248
|
"patterns": [],
|
|
247
249
|
"cached": true,
|
|
248
250
|
"parallel": true
|
|
@@ -266,12 +268,28 @@ NPM registries belong only here:
|
|
|
266
268
|
@git.zone/cli.release.targets.npm.registries
|
|
267
269
|
```
|
|
268
270
|
|
|
269
|
-
Docker
|
|
271
|
+
Canonical Docker destinations and repository mappings belong here. Registry
|
|
272
|
+
values should be hosts without `http://` or `https://`:
|
|
270
273
|
|
|
271
274
|
```text
|
|
272
275
|
@git.zone/tsdocker.registries
|
|
273
276
|
```
|
|
274
277
|
|
|
278
|
+
The Docker release target runs the project's pinned `@git.zone/tsdocker` through
|
|
279
|
+
`pnpm exec`; install it in each Docker-producing project:
|
|
280
|
+
|
|
281
|
+
```bash
|
|
282
|
+
pnpm add --save-dev @git.zone/tsdocker
|
|
283
|
+
```
|
|
284
|
+
|
|
285
|
+
Set `release.targets.docker.registry` to select one destination already declared
|
|
286
|
+
by the tSDocker config when a release must not publish to every configured
|
|
287
|
+
registry.
|
|
288
|
+
Set `release.targets.docker.buildRegistries` when the build should authenticate
|
|
289
|
+
only the configured registries used by private base images; an empty list keeps
|
|
290
|
+
the compatibility default of authenticating every configured registry. Bounded
|
|
291
|
+
build authentication requires project-local `@git.zone/tsdocker` 3.3.0 or newer.
|
|
292
|
+
|
|
275
293
|
Useful config commands:
|
|
276
294
|
|
|
277
295
|
```bash
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@git.zone/cli',
|
|
6
|
-
version: '3.0
|
|
6
|
+
version: '3.1.0',
|
|
7
7
|
description: 'A comprehensive CLI tool for enhancing and managing local development workflows with gitzone utilities, focusing on project setup, version control, code formatting, and template management.'
|
|
8
8
|
}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import * as plugins from './plugins.js';
|
|
2
|
+
|
|
3
|
+
export type TTsdockerBinaryAccess = (binaryPathArg: string) => Promise<void>;
|
|
4
|
+
|
|
5
|
+
export const getProjectTsdockerBinPath = (
|
|
6
|
+
projectRootArg: string,
|
|
7
|
+
platformArg: NodeJS.Platform = process.platform,
|
|
8
|
+
): string => {
|
|
9
|
+
return plugins.path.join(
|
|
10
|
+
projectRootArg,
|
|
11
|
+
'node_modules',
|
|
12
|
+
'.bin',
|
|
13
|
+
platformArg === 'win32' ? 'tsdocker.CMD' : 'tsdocker',
|
|
14
|
+
);
|
|
15
|
+
};
|
|
16
|
+
|
|
17
|
+
export const hasInstalledProjectTsdockerBinary = async (
|
|
18
|
+
projectRootArg: string,
|
|
19
|
+
platformArg: NodeJS.Platform = process.platform,
|
|
20
|
+
accessArg: TTsdockerBinaryAccess = async (binaryPathArg) => {
|
|
21
|
+
await plugins.fs.access(binaryPathArg);
|
|
22
|
+
},
|
|
23
|
+
): Promise<boolean> => {
|
|
24
|
+
try {
|
|
25
|
+
await accessArg(getProjectTsdockerBinPath(projectRootArg, platformArg));
|
|
26
|
+
return true;
|
|
27
|
+
} catch {
|
|
28
|
+
return false;
|
|
29
|
+
}
|
|
30
|
+
};
|
package/ts/helpers.workflow.ts
CHANGED
|
@@ -53,6 +53,8 @@ export interface IReleaseNpmTargetConfig {
|
|
|
53
53
|
export interface IReleaseDockerTargetConfig {
|
|
54
54
|
enabled?: boolean;
|
|
55
55
|
engine?: "tsdocker";
|
|
56
|
+
registry?: string;
|
|
57
|
+
buildRegistries?: string[];
|
|
56
58
|
patterns?: string[];
|
|
57
59
|
cached?: boolean;
|
|
58
60
|
parallel?: boolean | number;
|
|
@@ -116,6 +118,8 @@ export interface IResolvedReleaseWorkflow {
|
|
|
116
118
|
npmAlreadyPublished: "success" | "error";
|
|
117
119
|
dockerEnabled: boolean;
|
|
118
120
|
dockerEngine: "tsdocker";
|
|
121
|
+
dockerRegistry?: string;
|
|
122
|
+
dockerBuildRegistries: string[];
|
|
119
123
|
dockerPatterns: string[];
|
|
120
124
|
dockerCached: boolean;
|
|
121
125
|
dockerParallel: boolean | number;
|
|
@@ -145,6 +149,39 @@ const unique = <T>(items: T[]): T[] => {
|
|
|
145
149
|
return result;
|
|
146
150
|
};
|
|
147
151
|
|
|
152
|
+
export const supportsBoundedBuildRegistryAuthentication = (
|
|
153
|
+
versionOutputArg: string,
|
|
154
|
+
): boolean => {
|
|
155
|
+
const match = versionOutputArg.match(/(\d+)\.(\d+)\.(\d+)/);
|
|
156
|
+
if (!match) {
|
|
157
|
+
return false;
|
|
158
|
+
}
|
|
159
|
+
const major = Number(match[1]);
|
|
160
|
+
const minor = Number(match[2]);
|
|
161
|
+
return major > 3 || (major === 3 && minor >= 3);
|
|
162
|
+
};
|
|
163
|
+
|
|
164
|
+
const isStringRecord = (valueArg: unknown): valueArg is Record<string, unknown> => {
|
|
165
|
+
return typeof valueArg === "object" && valueArg !== null && !Array.isArray(valueArg);
|
|
166
|
+
};
|
|
167
|
+
|
|
168
|
+
export const getDeclaredTsdockerRange = (packageJsonArg: unknown): string | undefined => {
|
|
169
|
+
if (!isStringRecord(packageJsonArg)) {
|
|
170
|
+
return undefined;
|
|
171
|
+
}
|
|
172
|
+
for (const dependencyField of ["devDependencies", "dependencies"] as const) {
|
|
173
|
+
const dependencies = packageJsonArg[dependencyField];
|
|
174
|
+
if (!isStringRecord(dependencies)) {
|
|
175
|
+
continue;
|
|
176
|
+
}
|
|
177
|
+
const versionRange = dependencies["@git.zone/tsdocker"];
|
|
178
|
+
if (typeof versionRange === "string" && versionRange.trim()) {
|
|
179
|
+
return versionRange.trim();
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
return undefined;
|
|
183
|
+
};
|
|
184
|
+
|
|
148
185
|
const normalizeConfirmation = (
|
|
149
186
|
value: unknown,
|
|
150
187
|
fallback: TConfirmationMode,
|
|
@@ -395,6 +432,15 @@ export const resolveReleaseWorkflow = async (argvArg: any): Promise<IResolvedRel
|
|
|
395
432
|
npmAlreadyPublished: npmConfig.alreadyPublished || "success",
|
|
396
433
|
dockerEnabled,
|
|
397
434
|
dockerEngine: "tsdocker",
|
|
435
|
+
dockerRegistry: typeof dockerConfig.registry === "string" && dockerConfig.registry.trim()
|
|
436
|
+
? dockerConfig.registry.trim()
|
|
437
|
+
: undefined,
|
|
438
|
+
dockerBuildRegistries: Array.isArray(dockerConfig.buildRegistries)
|
|
439
|
+
? dockerConfig.buildRegistries
|
|
440
|
+
.filter((registryArg): registryArg is string => typeof registryArg === "string")
|
|
441
|
+
.map((registryArg) => registryArg.trim())
|
|
442
|
+
.filter(Boolean)
|
|
443
|
+
: [],
|
|
398
444
|
dockerPatterns: Array.isArray(dockerConfig.patterns) ? dockerConfig.patterns : [],
|
|
399
445
|
dockerCached: dockerConfig.cached ?? false,
|
|
400
446
|
dockerParallel: dockerConfig.parallel ?? false,
|
package/ts/mod_config/index.ts
CHANGED
|
@@ -19,6 +19,11 @@ import {
|
|
|
19
19
|
CURRENT_GITZONE_CLI_SCHEMA_VERSION,
|
|
20
20
|
migrateSmartconfigData,
|
|
21
21
|
} from "../helpers.smartconfigmigrations.js";
|
|
22
|
+
import {
|
|
23
|
+
getDeclaredTsdockerRange,
|
|
24
|
+
supportsBoundedBuildRegistryAuthentication,
|
|
25
|
+
} from "../helpers.workflow.js";
|
|
26
|
+
import { hasInstalledProjectTsdockerBinary } from "../helpers.tsdocker.js";
|
|
22
27
|
|
|
23
28
|
export { ReleaseConfig, CommitConfig };
|
|
24
29
|
|
|
@@ -871,6 +876,20 @@ async function handleRelease(mode: ICliMode): Promise<void> {
|
|
|
871
876
|
}
|
|
872
877
|
|
|
873
878
|
if (enabledTargets.includes("docker")) {
|
|
879
|
+
const registry = await askValue<string>(interactInstance, {
|
|
880
|
+
type: "input",
|
|
881
|
+
name: "dockerRegistry",
|
|
882
|
+
message: "Single tsdocker registry target (empty means all configured registries):",
|
|
883
|
+
default: currentTargets.docker?.registry || "",
|
|
884
|
+
});
|
|
885
|
+
const buildRegistries = await askValue<string>(interactInstance, {
|
|
886
|
+
type: "input",
|
|
887
|
+
name: "dockerBuildRegistries",
|
|
888
|
+
message: "Registries to authenticate before Docker builds (comma-separated, empty means all):",
|
|
889
|
+
default: Array.isArray(currentTargets.docker?.buildRegistries)
|
|
890
|
+
? currentTargets.docker.buildRegistries.join(", ")
|
|
891
|
+
: "",
|
|
892
|
+
});
|
|
874
893
|
const patterns = await askValue<string>(interactInstance, {
|
|
875
894
|
type: "input",
|
|
876
895
|
name: "dockerPatterns",
|
|
@@ -906,6 +925,8 @@ async function handleRelease(mode: ICliMode): Promise<void> {
|
|
|
906
925
|
releaseTargets.docker = {
|
|
907
926
|
enabled: true,
|
|
908
927
|
engine: "tsdocker",
|
|
928
|
+
registry: registry.trim() || undefined,
|
|
929
|
+
buildRegistries: parseCsv(buildRegistries),
|
|
909
930
|
patterns: parseCsv(patterns),
|
|
910
931
|
cached,
|
|
911
932
|
parallel: parseDockerParallel(parallel),
|
|
@@ -1296,6 +1317,7 @@ function parseConfigValue(rawValue: string): any {
|
|
|
1296
1317
|
) {
|
|
1297
1318
|
return JSON.parse(trimmedValue);
|
|
1298
1319
|
}
|
|
1320
|
+
|
|
1299
1321
|
return rawValue;
|
|
1300
1322
|
}
|
|
1301
1323
|
|
|
@@ -1963,6 +1985,36 @@ async function validateDockerTarget(
|
|
|
1963
1985
|
});
|
|
1964
1986
|
}
|
|
1965
1987
|
|
|
1988
|
+
if (
|
|
1989
|
+
dockerTarget.registry !== undefined
|
|
1990
|
+
&& (typeof dockerTarget.registry !== "string"
|
|
1991
|
+
|| !dockerTarget.registry.trim()
|
|
1992
|
+
|| /^https?:\/\//.test(dockerTarget.registry))
|
|
1993
|
+
) {
|
|
1994
|
+
findings.push({
|
|
1995
|
+
level: "error",
|
|
1996
|
+
message: `Invalid tsdocker release registry: ${formatValue(dockerTarget.registry)}`,
|
|
1997
|
+
fix: "Use one configured registry host without a protocol, or remove release.targets.docker.registry.",
|
|
1998
|
+
});
|
|
1999
|
+
}
|
|
2000
|
+
|
|
2001
|
+
if (
|
|
2002
|
+
dockerTarget.buildRegistries !== undefined
|
|
2003
|
+
&& (!Array.isArray(dockerTarget.buildRegistries)
|
|
2004
|
+
|| dockerTarget.buildRegistries.some((registryArg: unknown) =>
|
|
2005
|
+
typeof registryArg !== "string"
|
|
2006
|
+
|| !registryArg.trim()
|
|
2007
|
+
|| /^https?:\/\//.test(registryArg)
|
|
2008
|
+
)
|
|
2009
|
+
|| new Set(dockerTarget.buildRegistries).size !== dockerTarget.buildRegistries.length)
|
|
2010
|
+
) {
|
|
2011
|
+
findings.push({
|
|
2012
|
+
level: "error",
|
|
2013
|
+
message: "Invalid tsdocker build registry authentication list",
|
|
2014
|
+
fix: "Use unique configured registry hosts without protocols, or remove release.targets.docker.buildRegistries.",
|
|
2015
|
+
});
|
|
2016
|
+
}
|
|
2017
|
+
|
|
1966
2018
|
if (!isValidDockerParallel(dockerTarget.parallel)) {
|
|
1967
2019
|
findings.push({
|
|
1968
2020
|
level: "error",
|
|
@@ -1982,7 +2034,7 @@ async function validateDockerTarget(
|
|
|
1982
2034
|
validateTsdockerProjectConfig(tsdockerConfig, findings);
|
|
1983
2035
|
}
|
|
1984
2036
|
|
|
1985
|
-
await validateTsdockerCommand(findings);
|
|
2037
|
+
await validateTsdockerCommand(findings, dockerTarget.buildRegistries);
|
|
1986
2038
|
|
|
1987
2039
|
findings.push({
|
|
1988
2040
|
level: "ok",
|
|
@@ -2064,30 +2116,66 @@ function validateTsdockerProjectConfig(
|
|
|
2064
2116
|
});
|
|
2065
2117
|
}
|
|
2066
2118
|
|
|
2067
|
-
async function validateTsdockerCommand(
|
|
2119
|
+
async function validateTsdockerCommand(
|
|
2120
|
+
findings: IDoctorFinding[],
|
|
2121
|
+
buildRegistriesArg: unknown,
|
|
2122
|
+
): Promise<void> {
|
|
2123
|
+
let packageJson: unknown;
|
|
2124
|
+
try {
|
|
2125
|
+
packageJson = JSON.parse(
|
|
2126
|
+
await plugins.fs.readFile(plugins.path.join(process.cwd(), "package.json"), "utf8"),
|
|
2127
|
+
);
|
|
2128
|
+
} catch {
|
|
2129
|
+
packageJson = undefined;
|
|
2130
|
+
}
|
|
2131
|
+
if (!getDeclaredTsdockerRange(packageJson)) {
|
|
2132
|
+
findings.push({
|
|
2133
|
+
level: "error",
|
|
2134
|
+
message: "Docker release target requires project-local @git.zone/tsdocker",
|
|
2135
|
+
fix: "Run pnpm add --save-dev @git.zone/tsdocker.",
|
|
2136
|
+
});
|
|
2137
|
+
}
|
|
2138
|
+
if (!(await hasInstalledProjectTsdockerBinary(process.cwd()))) {
|
|
2139
|
+
findings.push({
|
|
2140
|
+
level: "error",
|
|
2141
|
+
message: "Project-local tSDocker binary is not installed",
|
|
2142
|
+
fix: "Run pnpm install after declaring @git.zone/tsdocker.",
|
|
2143
|
+
});
|
|
2144
|
+
}
|
|
2068
2145
|
const smartshellInstance = new plugins.smartshell.Smartshell({
|
|
2069
2146
|
executor: "bash",
|
|
2070
2147
|
sourceFilePaths: [],
|
|
2071
2148
|
});
|
|
2072
2149
|
try {
|
|
2073
2150
|
const result = await smartshellInstance.execSpawn(
|
|
2074
|
-
"
|
|
2075
|
-
["--version"],
|
|
2151
|
+
"pnpm",
|
|
2152
|
+
["exec", "tsdocker", "--version"],
|
|
2076
2153
|
{ silent: true, timeout: 8000 },
|
|
2077
2154
|
);
|
|
2078
2155
|
if (result.exitCode === 0) {
|
|
2079
2156
|
findings.push({ level: "ok", message: "tsdocker command is available" });
|
|
2157
|
+
if (
|
|
2158
|
+
Array.isArray(buildRegistriesArg)
|
|
2159
|
+
&& buildRegistriesArg.length > 0
|
|
2160
|
+
&& !supportsBoundedBuildRegistryAuthentication(result.combinedOutput)
|
|
2161
|
+
) {
|
|
2162
|
+
findings.push({
|
|
2163
|
+
level: "error",
|
|
2164
|
+
message: "Bounded Docker build authentication requires @git.zone/tsdocker >= 3.3.0",
|
|
2165
|
+
fix: "Upgrade the project's @git.zone/tsdocker dev dependency to at least 3.3.0.",
|
|
2166
|
+
});
|
|
2167
|
+
}
|
|
2080
2168
|
} else {
|
|
2081
2169
|
findings.push({
|
|
2082
2170
|
level: "error",
|
|
2083
|
-
message: "tsdocker command is not available",
|
|
2084
|
-
fix: "Install @git.zone/tsdocker
|
|
2171
|
+
message: "Project-local tsdocker command is not available",
|
|
2172
|
+
fix: "Install @git.zone/tsdocker as a project dev dependency.",
|
|
2085
2173
|
});
|
|
2086
2174
|
}
|
|
2087
2175
|
} catch (error) {
|
|
2088
2176
|
findings.push({
|
|
2089
2177
|
level: "error",
|
|
2090
|
-
message: "Could not execute tsdocker",
|
|
2178
|
+
message: "Could not execute project-local tsdocker",
|
|
2091
2179
|
fix: error instanceof Error ? error.message : String(error),
|
|
2092
2180
|
});
|
|
2093
2181
|
}
|
package/ts/mod_release/index.ts
CHANGED
|
@@ -9,10 +9,13 @@ import {
|
|
|
9
9
|
readPendingChangelog,
|
|
10
10
|
} from "../helpers.changelog.js";
|
|
11
11
|
import {
|
|
12
|
+
getDeclaredTsdockerRange,
|
|
12
13
|
resolveReleaseWorkflow,
|
|
14
|
+
supportsBoundedBuildRegistryAuthentication,
|
|
13
15
|
type IResolvedReleaseWorkflow,
|
|
14
16
|
} from "../helpers.workflow.js";
|
|
15
17
|
import * as commitHelpers from "../mod_commit/mod.helpers.js";
|
|
18
|
+
import { hasInstalledProjectTsdockerBinary } from "../helpers.tsdocker.js";
|
|
16
19
|
|
|
17
20
|
type TTargetStatus = "success" | "already-published" | "skipped" | "failed";
|
|
18
21
|
|
|
@@ -267,6 +270,43 @@ async function runDockerTarget(
|
|
|
267
270
|
return [{ target: "docker", status: "skipped", message: "disabled" }];
|
|
268
271
|
}
|
|
269
272
|
|
|
273
|
+
let packageJson: unknown;
|
|
274
|
+
try {
|
|
275
|
+
packageJson = JSON.parse(
|
|
276
|
+
await plugins.fs.readFile(plugins.path.join(paths.cwd, "package.json"), "utf8"),
|
|
277
|
+
);
|
|
278
|
+
} catch {
|
|
279
|
+
packageJson = undefined;
|
|
280
|
+
}
|
|
281
|
+
if (!getDeclaredTsdockerRange(packageJson)) {
|
|
282
|
+
return [{
|
|
283
|
+
target: "tsdocker",
|
|
284
|
+
status: "failed",
|
|
285
|
+
message: "Docker releases require @git.zone/tsdocker as a project dependency",
|
|
286
|
+
}];
|
|
287
|
+
}
|
|
288
|
+
if (!(await hasInstalledProjectTsdockerBinary(paths.cwd))) {
|
|
289
|
+
return [{
|
|
290
|
+
target: "tsdocker",
|
|
291
|
+
status: "failed",
|
|
292
|
+
message: "Docker releases require the installed project-local tSDocker binary",
|
|
293
|
+
}];
|
|
294
|
+
}
|
|
295
|
+
|
|
296
|
+
if (workflow.dockerBuildRegistries.length > 0) {
|
|
297
|
+
const versionResult = await smartshellInstance.exec("pnpm exec tsdocker --version");
|
|
298
|
+
if (
|
|
299
|
+
versionResult.exitCode !== 0
|
|
300
|
+
|| !supportsBoundedBuildRegistryAuthentication(versionResult.combinedOutput)
|
|
301
|
+
) {
|
|
302
|
+
return [{
|
|
303
|
+
target: "tsdocker",
|
|
304
|
+
status: "failed",
|
|
305
|
+
message: "release.targets.docker.buildRegistries requires project-local @git.zone/tsdocker >= 3.3.0",
|
|
306
|
+
}];
|
|
307
|
+
}
|
|
308
|
+
}
|
|
309
|
+
|
|
270
310
|
const command = buildTsdockerPushCommand(workflow);
|
|
271
311
|
const result = await smartshellInstance.exec(command);
|
|
272
312
|
const output = result.combinedOutput;
|
|
@@ -279,8 +319,25 @@ async function runDockerTarget(
|
|
|
279
319
|
}];
|
|
280
320
|
}
|
|
281
321
|
|
|
282
|
-
|
|
283
|
-
|
|
322
|
+
type TDockerCommandWorkflow = Pick<
|
|
323
|
+
IResolvedReleaseWorkflow,
|
|
324
|
+
| "dockerRegistry"
|
|
325
|
+
| "dockerBuildRegistries"
|
|
326
|
+
| "dockerNoBuild"
|
|
327
|
+
| "dockerCached"
|
|
328
|
+
| "dockerParallel"
|
|
329
|
+
| "dockerContext"
|
|
330
|
+
| "dockerPatterns"
|
|
331
|
+
>;
|
|
332
|
+
|
|
333
|
+
export function buildTsdockerPushCommand(workflow: TDockerCommandWorkflow): string {
|
|
334
|
+
const commandParts = ["pnpm", "exec", "tsdocker", "push"];
|
|
335
|
+
if (workflow.dockerRegistry) {
|
|
336
|
+
commandParts.push(`--registry=${shellQuote(workflow.dockerRegistry)}`);
|
|
337
|
+
}
|
|
338
|
+
if (workflow.dockerBuildRegistries.length > 0) {
|
|
339
|
+
commandParts.push(`--build-registries=${shellQuote(workflow.dockerBuildRegistries.join(","))}`);
|
|
340
|
+
}
|
|
284
341
|
if (workflow.dockerNoBuild) {
|
|
285
342
|
commandParts.push("--no-build");
|
|
286
343
|
}
|
|
@@ -328,6 +385,8 @@ function printReleasePlan(workflow: IResolvedReleaseWorkflow): void {
|
|
|
328
385
|
}
|
|
329
386
|
if (workflow.targets.includes("docker")) {
|
|
330
387
|
console.log(`docker engine: ${workflow.dockerEngine}`);
|
|
388
|
+
console.log(`docker registry: ${workflow.dockerRegistry || "all configured registries"}`);
|
|
389
|
+
console.log(`docker build authentication: ${workflow.dockerBuildRegistries.length > 0 ? workflow.dockerBuildRegistries.join(", ") : "all configured registries"}`);
|
|
331
390
|
console.log(`docker patterns: ${workflow.dockerPatterns.length > 0 ? workflow.dockerPatterns.join(", ") : "all Dockerfiles"}`);
|
|
332
391
|
console.log(`docker options: ${formatDockerOptions(workflow)}`);
|
|
333
392
|
}
|
|
@@ -336,6 +395,10 @@ function printReleasePlan(workflow: IResolvedReleaseWorkflow): void {
|
|
|
336
395
|
|
|
337
396
|
function formatDockerOptions(workflow: IResolvedReleaseWorkflow): string {
|
|
338
397
|
const options: string[] = [];
|
|
398
|
+
if (workflow.dockerRegistry) options.push(`registry=${workflow.dockerRegistry}`);
|
|
399
|
+
if (workflow.dockerBuildRegistries.length > 0) {
|
|
400
|
+
options.push(`buildRegistries=${workflow.dockerBuildRegistries.join(",")}`);
|
|
401
|
+
}
|
|
339
402
|
if (workflow.dockerCached) options.push("cached");
|
|
340
403
|
if (workflow.dockerParallel) options.push(`parallel=${workflow.dockerParallel === true ? "true" : workflow.dockerParallel}`);
|
|
341
404
|
if (workflow.dockerNoBuild) options.push("no-build");
|