@git.zone/tsdocker 1.12.0 → 1.14.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/classes.dockercontext.d.ts +14 -0
- package/dist_ts/classes.dockercontext.js +59 -0
- package/dist_ts/classes.dockerfile.d.ts +15 -1
- package/dist_ts/classes.dockerfile.js +111 -21
- package/dist_ts/classes.tsdockermanager.d.ts +3 -1
- package/dist_ts/classes.tsdockermanager.js +117 -40
- package/dist_ts/interfaces/index.d.ts +9 -0
- package/dist_ts/tsdocker.cli.js +25 -7
- package/package.json +1 -1
- package/readme.hints.md +12 -0
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.dockercontext.ts +69 -0
- package/ts/classes.dockerfile.ts +123 -23
- package/ts/classes.tsdockermanager.ts +121 -39
- package/ts/interfaces/index.ts +10 -0
- package/ts/tsdocker.cli.ts +24 -6
|
@@ -5,6 +5,7 @@ import { Dockerfile } from './classes.dockerfile.js';
|
|
|
5
5
|
import { DockerRegistry } from './classes.dockerregistry.js';
|
|
6
6
|
import { RegistryStorage } from './classes.registrystorage.js';
|
|
7
7
|
import { TsDockerCache } from './classes.tsdockercache.js';
|
|
8
|
+
import { DockerContext } from './classes.dockercontext.js';
|
|
8
9
|
const smartshellInstance = new plugins.smartshell.Smartshell({
|
|
9
10
|
executor: 'bash',
|
|
10
11
|
});
|
|
@@ -15,15 +16,24 @@ export class TsDockerManager {
|
|
|
15
16
|
registryStorage;
|
|
16
17
|
config;
|
|
17
18
|
projectInfo;
|
|
19
|
+
dockerContext;
|
|
18
20
|
dockerfiles = [];
|
|
19
21
|
constructor(config) {
|
|
20
22
|
this.config = config;
|
|
21
23
|
this.registryStorage = new RegistryStorage();
|
|
24
|
+
this.dockerContext = new DockerContext();
|
|
22
25
|
}
|
|
23
26
|
/**
|
|
24
27
|
* Prepares the manager by loading project info and registries
|
|
25
28
|
*/
|
|
26
|
-
async prepare() {
|
|
29
|
+
async prepare(contextArg) {
|
|
30
|
+
// Detect Docker context
|
|
31
|
+
if (contextArg) {
|
|
32
|
+
this.dockerContext.setContext(contextArg);
|
|
33
|
+
}
|
|
34
|
+
await this.dockerContext.detect();
|
|
35
|
+
this.dockerContext.logContextInfo();
|
|
36
|
+
this.dockerContext.logRootlessWarnings();
|
|
27
37
|
// Load project info
|
|
28
38
|
try {
|
|
29
39
|
const projectinfoInstance = new plugins.projectinfo.ProjectInfo(paths.cwd);
|
|
@@ -137,6 +147,15 @@ export class TsDockerManager {
|
|
|
137
147
|
if (options?.noCache) {
|
|
138
148
|
logger.log('info', 'Cache: disabled (--no-cache)');
|
|
139
149
|
}
|
|
150
|
+
if (options?.parallel) {
|
|
151
|
+
const concurrency = options.parallelConcurrency ?? 4;
|
|
152
|
+
const levels = Dockerfile.computeLevels(toBuild);
|
|
153
|
+
logger.log('info', `Parallel build: ${levels.length} level(s), concurrency ${concurrency}`);
|
|
154
|
+
for (let l = 0; l < levels.length; l++) {
|
|
155
|
+
const level = levels[l];
|
|
156
|
+
logger.log('info', ` Level ${l} (${level.length}): ${level.map(df => df.cleanTag).join(', ')}`);
|
|
157
|
+
}
|
|
158
|
+
}
|
|
140
159
|
logger.log('info', `Building ${toBuild.length} Dockerfile(s)...`);
|
|
141
160
|
if (options?.cached) {
|
|
142
161
|
// === CACHED MODE: skip builds for unchanged Dockerfiles ===
|
|
@@ -147,42 +166,95 @@ export class TsDockerManager {
|
|
|
147
166
|
const overallStart = Date.now();
|
|
148
167
|
const useRegistry = Dockerfile.needsLocalRegistry(toBuild, options);
|
|
149
168
|
if (useRegistry) {
|
|
150
|
-
await Dockerfile.startLocalRegistry();
|
|
169
|
+
await Dockerfile.startLocalRegistry(this.dockerContext.contextInfo?.isRootless);
|
|
151
170
|
}
|
|
152
171
|
try {
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
const
|
|
156
|
-
const
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
172
|
+
if (options?.parallel) {
|
|
173
|
+
// === PARALLEL CACHED MODE ===
|
|
174
|
+
const concurrency = options.parallelConcurrency ?? 4;
|
|
175
|
+
const levels = Dockerfile.computeLevels(toBuild);
|
|
176
|
+
let built = 0;
|
|
177
|
+
for (let l = 0; l < levels.length; l++) {
|
|
178
|
+
const level = levels[l];
|
|
179
|
+
logger.log('info', `--- Level ${l}: building ${level.length} image(s) in parallel ---`);
|
|
180
|
+
const tasks = level.map((df) => {
|
|
181
|
+
const myIndex = ++built;
|
|
182
|
+
return async () => {
|
|
183
|
+
const progress = `(${myIndex}/${total})`;
|
|
184
|
+
const skip = await cache.shouldSkipBuild(df.cleanTag, df.content);
|
|
185
|
+
if (skip) {
|
|
186
|
+
logger.log('ok', `${progress} Skipped ${df.cleanTag} (cached)`);
|
|
187
|
+
}
|
|
188
|
+
else {
|
|
189
|
+
logger.log('info', `${progress} Building ${df.cleanTag}...`);
|
|
190
|
+
const elapsed = await df.build({
|
|
191
|
+
platform: options?.platform,
|
|
192
|
+
timeout: options?.timeout,
|
|
193
|
+
noCache: options?.noCache,
|
|
194
|
+
verbose: options?.verbose,
|
|
195
|
+
});
|
|
196
|
+
logger.log('ok', `${progress} Built ${df.cleanTag} in ${formatDuration(elapsed)}`);
|
|
197
|
+
const imageId = await df.getId();
|
|
198
|
+
cache.recordBuild(df.cleanTag, df.content, imageId, df.buildTag);
|
|
199
|
+
}
|
|
200
|
+
return df;
|
|
201
|
+
};
|
|
167
202
|
});
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
203
|
+
await Dockerfile.runWithConcurrency(tasks, concurrency);
|
|
204
|
+
// After the entire level completes, tag + push for dependency resolution
|
|
205
|
+
for (const df of level) {
|
|
206
|
+
const dependentBaseImages = new Set();
|
|
207
|
+
for (const other of toBuild) {
|
|
208
|
+
if (other.localBaseDockerfile === df && other.baseImage !== df.buildTag) {
|
|
209
|
+
dependentBaseImages.add(other.baseImage);
|
|
210
|
+
}
|
|
211
|
+
}
|
|
212
|
+
for (const fullTag of dependentBaseImages) {
|
|
213
|
+
logger.log('info', `Tagging ${df.buildTag} as ${fullTag} for local dependency resolution`);
|
|
214
|
+
await smartshellInstance.exec(`docker tag ${df.buildTag} ${fullTag}`);
|
|
215
|
+
}
|
|
216
|
+
if (useRegistry && toBuild.some(other => other.localBaseDockerfile === df)) {
|
|
217
|
+
await Dockerfile.pushToLocalRegistry(df);
|
|
218
|
+
}
|
|
177
219
|
}
|
|
178
220
|
}
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
await
|
|
221
|
+
}
|
|
222
|
+
else {
|
|
223
|
+
// === SEQUENTIAL CACHED MODE ===
|
|
224
|
+
for (let i = 0; i < total; i++) {
|
|
225
|
+
const dockerfileArg = toBuild[i];
|
|
226
|
+
const progress = `(${i + 1}/${total})`;
|
|
227
|
+
const skip = await cache.shouldSkipBuild(dockerfileArg.cleanTag, dockerfileArg.content);
|
|
228
|
+
if (skip) {
|
|
229
|
+
logger.log('ok', `${progress} Skipped ${dockerfileArg.cleanTag} (cached)`);
|
|
230
|
+
}
|
|
231
|
+
else {
|
|
232
|
+
logger.log('info', `${progress} Building ${dockerfileArg.cleanTag}...`);
|
|
233
|
+
const elapsed = await dockerfileArg.build({
|
|
234
|
+
platform: options?.platform,
|
|
235
|
+
timeout: options?.timeout,
|
|
236
|
+
noCache: options?.noCache,
|
|
237
|
+
verbose: options?.verbose,
|
|
238
|
+
});
|
|
239
|
+
logger.log('ok', `${progress} Built ${dockerfileArg.cleanTag} in ${formatDuration(elapsed)}`);
|
|
240
|
+
const imageId = await dockerfileArg.getId();
|
|
241
|
+
cache.recordBuild(dockerfileArg.cleanTag, dockerfileArg.content, imageId, dockerfileArg.buildTag);
|
|
242
|
+
}
|
|
243
|
+
// Tag for dependents IMMEDIATELY (not after all builds)
|
|
244
|
+
const dependentBaseImages = new Set();
|
|
245
|
+
for (const other of toBuild) {
|
|
246
|
+
if (other.localBaseDockerfile === dockerfileArg && other.baseImage !== dockerfileArg.buildTag) {
|
|
247
|
+
dependentBaseImages.add(other.baseImage);
|
|
248
|
+
}
|
|
249
|
+
}
|
|
250
|
+
for (const fullTag of dependentBaseImages) {
|
|
251
|
+
logger.log('info', `Tagging ${dockerfileArg.buildTag} as ${fullTag} for local dependency resolution`);
|
|
252
|
+
await smartshellInstance.exec(`docker tag ${dockerfileArg.buildTag} ${fullTag}`);
|
|
253
|
+
}
|
|
254
|
+
// Push to local registry for buildx (even for cache hits — image exists but registry doesn't)
|
|
255
|
+
if (useRegistry && toBuild.some(other => other.localBaseDockerfile === dockerfileArg)) {
|
|
256
|
+
await Dockerfile.pushToLocalRegistry(dockerfileArg);
|
|
257
|
+
}
|
|
186
258
|
}
|
|
187
259
|
}
|
|
188
260
|
}
|
|
@@ -201,6 +273,9 @@ export class TsDockerManager {
|
|
|
201
273
|
timeout: options?.timeout,
|
|
202
274
|
noCache: options?.noCache,
|
|
203
275
|
verbose: options?.verbose,
|
|
276
|
+
isRootless: this.dockerContext.contextInfo?.isRootless,
|
|
277
|
+
parallel: options?.parallel,
|
|
278
|
+
parallelConcurrency: options?.parallelConcurrency,
|
|
204
279
|
});
|
|
205
280
|
}
|
|
206
281
|
logger.log('success', 'All Dockerfiles built successfully');
|
|
@@ -228,27 +303,29 @@ export class TsDockerManager {
|
|
|
228
303
|
* Ensures Docker buildx is set up for multi-architecture builds
|
|
229
304
|
*/
|
|
230
305
|
async ensureBuildx() {
|
|
306
|
+
const builderName = this.dockerContext.getBuilderName();
|
|
231
307
|
const platforms = this.config.platforms?.join(', ') || 'default';
|
|
232
|
-
logger.log('info', `Setting up Docker buildx
|
|
233
|
-
|
|
308
|
+
logger.log('info', `Setting up Docker buildx [${platforms}]...`);
|
|
309
|
+
logger.log('info', `Builder: ${builderName}`);
|
|
310
|
+
const inspectResult = await smartshellInstance.exec(`docker buildx inspect ${builderName} 2>/dev/null`);
|
|
234
311
|
if (inspectResult.exitCode !== 0) {
|
|
235
312
|
logger.log('info', 'Creating new buildx builder with host network...');
|
|
236
|
-
await smartshellInstance.exec(
|
|
313
|
+
await smartshellInstance.exec(`docker buildx create --name ${builderName} --driver docker-container --driver-opt network=host --use`);
|
|
237
314
|
await smartshellInstance.exec('docker buildx inspect --bootstrap');
|
|
238
315
|
}
|
|
239
316
|
else {
|
|
240
317
|
const inspectOutput = inspectResult.stdout || '';
|
|
241
318
|
if (!inspectOutput.includes('network=host')) {
|
|
242
319
|
logger.log('info', 'Recreating buildx builder with host network (migration)...');
|
|
243
|
-
await smartshellInstance.exec(
|
|
244
|
-
await smartshellInstance.exec(
|
|
320
|
+
await smartshellInstance.exec(`docker buildx rm ${builderName} 2>/dev/null`);
|
|
321
|
+
await smartshellInstance.exec(`docker buildx create --name ${builderName} --driver docker-container --driver-opt network=host --use`);
|
|
245
322
|
await smartshellInstance.exec('docker buildx inspect --bootstrap');
|
|
246
323
|
}
|
|
247
324
|
else {
|
|
248
|
-
await smartshellInstance.exec(
|
|
325
|
+
await smartshellInstance.exec(`docker buildx use ${builderName}`);
|
|
249
326
|
}
|
|
250
327
|
}
|
|
251
|
-
logger.log('ok', `Docker buildx ready (platforms: ${platforms})`);
|
|
328
|
+
logger.log('ok', `Docker buildx ready (builder: ${builderName}, platforms: ${platforms})`);
|
|
252
329
|
}
|
|
253
330
|
/**
|
|
254
331
|
* Pushes all built images to specified registries
|
|
@@ -354,4 +431,4 @@ export class TsDockerManager {
|
|
|
354
431
|
return this.dockerfiles;
|
|
355
432
|
}
|
|
356
433
|
}
|
|
357
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.tsdockermanager.js","sourceRoot":"","sources":["../ts/classes.tsdockermanager.ts"],"names":[],"mappings":"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"}
|
|
434
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.tsdockermanager.js","sourceRoot":"","sources":["../ts/classes.tsdockermanager.ts"],"names":[],"mappings":"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"}
|
|
@@ -76,6 +76,9 @@ export interface IBuildCommandOptions {
|
|
|
76
76
|
noCache?: boolean;
|
|
77
77
|
cached?: boolean;
|
|
78
78
|
verbose?: boolean;
|
|
79
|
+
context?: string;
|
|
80
|
+
parallel?: boolean;
|
|
81
|
+
parallelConcurrency?: number;
|
|
79
82
|
}
|
|
80
83
|
export interface ICacheEntry {
|
|
81
84
|
contentHash: string;
|
|
@@ -89,3 +92,9 @@ export interface ICacheData {
|
|
|
89
92
|
[cleanTag: string]: ICacheEntry;
|
|
90
93
|
};
|
|
91
94
|
}
|
|
95
|
+
export interface IDockerContextInfo {
|
|
96
|
+
name: string;
|
|
97
|
+
endpoint: string;
|
|
98
|
+
isRootless: boolean;
|
|
99
|
+
dockerHost?: string;
|
|
100
|
+
}
|
package/dist_ts/tsdocker.cli.js
CHANGED
|
@@ -28,7 +28,7 @@ export let run = () => {
|
|
|
28
28
|
try {
|
|
29
29
|
const config = await ConfigModule.run();
|
|
30
30
|
const manager = new TsDockerManager(config);
|
|
31
|
-
await manager.prepare();
|
|
31
|
+
await manager.prepare(argvArg.context);
|
|
32
32
|
const buildOptions = {};
|
|
33
33
|
const patterns = argvArg._.slice(1);
|
|
34
34
|
if (patterns.length > 0) {
|
|
@@ -49,6 +49,12 @@ export let run = () => {
|
|
|
49
49
|
if (argvArg.verbose) {
|
|
50
50
|
buildOptions.verbose = true;
|
|
51
51
|
}
|
|
52
|
+
if (argvArg.parallel) {
|
|
53
|
+
buildOptions.parallel = true;
|
|
54
|
+
if (typeof argvArg.parallel === 'number') {
|
|
55
|
+
buildOptions.parallelConcurrency = argvArg.parallel;
|
|
56
|
+
}
|
|
57
|
+
}
|
|
52
58
|
await manager.build(buildOptions);
|
|
53
59
|
logger.log('success', 'Build completed successfully');
|
|
54
60
|
}
|
|
@@ -65,7 +71,7 @@ export let run = () => {
|
|
|
65
71
|
try {
|
|
66
72
|
const config = await ConfigModule.run();
|
|
67
73
|
const manager = new TsDockerManager(config);
|
|
68
|
-
await manager.prepare();
|
|
74
|
+
await manager.prepare(argvArg.context);
|
|
69
75
|
// Login first
|
|
70
76
|
await manager.login();
|
|
71
77
|
// Parse build options from positional args and flags
|
|
@@ -86,6 +92,12 @@ export let run = () => {
|
|
|
86
92
|
if (argvArg.verbose) {
|
|
87
93
|
buildOptions.verbose = true;
|
|
88
94
|
}
|
|
95
|
+
if (argvArg.parallel) {
|
|
96
|
+
buildOptions.parallel = true;
|
|
97
|
+
if (typeof argvArg.parallel === 'number') {
|
|
98
|
+
buildOptions.parallelConcurrency = argvArg.parallel;
|
|
99
|
+
}
|
|
100
|
+
}
|
|
89
101
|
// Build images first (if not already built)
|
|
90
102
|
await manager.build(buildOptions);
|
|
91
103
|
// Get registry from --registry flag
|
|
@@ -111,7 +123,7 @@ export let run = () => {
|
|
|
111
123
|
}
|
|
112
124
|
const config = await ConfigModule.run();
|
|
113
125
|
const manager = new TsDockerManager(config);
|
|
114
|
-
await manager.prepare();
|
|
126
|
+
await manager.prepare(argvArg.context);
|
|
115
127
|
// Login first
|
|
116
128
|
await manager.login();
|
|
117
129
|
await manager.pull(registryArg);
|
|
@@ -129,7 +141,7 @@ export let run = () => {
|
|
|
129
141
|
try {
|
|
130
142
|
const config = await ConfigModule.run();
|
|
131
143
|
const manager = new TsDockerManager(config);
|
|
132
|
-
await manager.prepare();
|
|
144
|
+
await manager.prepare(argvArg.context);
|
|
133
145
|
// Build images first
|
|
134
146
|
const buildOptions = {};
|
|
135
147
|
if (argvArg.cache === false) {
|
|
@@ -141,6 +153,12 @@ export let run = () => {
|
|
|
141
153
|
if (argvArg.verbose) {
|
|
142
154
|
buildOptions.verbose = true;
|
|
143
155
|
}
|
|
156
|
+
if (argvArg.parallel) {
|
|
157
|
+
buildOptions.parallel = true;
|
|
158
|
+
if (typeof argvArg.parallel === 'number') {
|
|
159
|
+
buildOptions.parallelConcurrency = argvArg.parallel;
|
|
160
|
+
}
|
|
161
|
+
}
|
|
144
162
|
await manager.build(buildOptions);
|
|
145
163
|
// Run tests
|
|
146
164
|
await manager.test();
|
|
@@ -158,7 +176,7 @@ export let run = () => {
|
|
|
158
176
|
try {
|
|
159
177
|
const config = await ConfigModule.run();
|
|
160
178
|
const manager = new TsDockerManager(config);
|
|
161
|
-
await manager.prepare();
|
|
179
|
+
await manager.prepare(argvArg.context);
|
|
162
180
|
await manager.login();
|
|
163
181
|
logger.log('success', 'Login completed successfully');
|
|
164
182
|
}
|
|
@@ -174,7 +192,7 @@ export let run = () => {
|
|
|
174
192
|
try {
|
|
175
193
|
const config = await ConfigModule.run();
|
|
176
194
|
const manager = new TsDockerManager(config);
|
|
177
|
-
await manager.prepare();
|
|
195
|
+
await manager.prepare(argvArg.context);
|
|
178
196
|
await manager.list();
|
|
179
197
|
}
|
|
180
198
|
catch (err) {
|
|
@@ -228,4 +246,4 @@ export let run = () => {
|
|
|
228
246
|
});
|
|
229
247
|
tsdockerCli.startParse();
|
|
230
248
|
};
|
|
231
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tsdocker.cli.js","sourceRoot":"","sources":["../ts/tsdocker.cli.ts"],"names":[],"mappings":"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"}
|
|
249
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tsdocker.cli.js","sourceRoot":"","sources":["../ts/tsdocker.cli.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/readme.hints.md
CHANGED
|
@@ -96,6 +96,18 @@ ts/
|
|
|
96
96
|
- `@push.rocks/smartcli`: CLI framework
|
|
97
97
|
- `@push.rocks/projectinfo`: Project metadata
|
|
98
98
|
|
|
99
|
+
## Parallel Builds
|
|
100
|
+
|
|
101
|
+
`--parallel` flag enables level-based parallel Docker builds:
|
|
102
|
+
|
|
103
|
+
```bash
|
|
104
|
+
tsdocker build --parallel # parallel, default concurrency (4)
|
|
105
|
+
tsdocker build --parallel=8 # parallel, concurrency 8
|
|
106
|
+
tsdocker build --parallel --cached # works with both modes
|
|
107
|
+
```
|
|
108
|
+
|
|
109
|
+
Implementation: `Dockerfile.computeLevels()` groups topologically sorted Dockerfiles into dependency levels. `Dockerfile.runWithConcurrency()` provides a worker-pool pattern for bounded concurrency. Both are public static methods on the `Dockerfile` class. The parallel logic exists in both `Dockerfile.buildDockerfiles()` (standard mode) and `TsDockerManager.build()` (cached mode).
|
|
110
|
+
|
|
99
111
|
## Build Status
|
|
100
112
|
|
|
101
113
|
- Build: ✅ Passes
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
import * as plugins from './tsdocker.plugins.js';
|
|
2
|
+
import { logger } from './tsdocker.logging.js';
|
|
3
|
+
import type { IDockerContextInfo } from './interfaces/index.js';
|
|
4
|
+
|
|
5
|
+
const smartshellInstance = new plugins.smartshell.Smartshell({ executor: 'bash' });
|
|
6
|
+
|
|
7
|
+
export class DockerContext {
|
|
8
|
+
public contextInfo: IDockerContextInfo | null = null;
|
|
9
|
+
|
|
10
|
+
/** Sets DOCKER_CONTEXT env var for explicit context selection. */
|
|
11
|
+
public setContext(contextName: string): void {
|
|
12
|
+
process.env.DOCKER_CONTEXT = contextName;
|
|
13
|
+
logger.log('info', `Docker context explicitly set to: ${contextName}`);
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
/** Detects current Docker context via `docker context inspect` and rootless via `docker info`. */
|
|
17
|
+
public async detect(): Promise<IDockerContextInfo> {
|
|
18
|
+
let name = 'default';
|
|
19
|
+
let endpoint = 'unknown';
|
|
20
|
+
|
|
21
|
+
const contextResult = await smartshellInstance.execSilent(
|
|
22
|
+
`docker context inspect --format '{{json .}}'`
|
|
23
|
+
);
|
|
24
|
+
if (contextResult.exitCode === 0 && contextResult.stdout) {
|
|
25
|
+
try {
|
|
26
|
+
const parsed = JSON.parse(contextResult.stdout.trim());
|
|
27
|
+
const data = Array.isArray(parsed) ? parsed[0] : parsed;
|
|
28
|
+
name = data.Name || 'default';
|
|
29
|
+
endpoint = data.Endpoints?.docker?.Host || 'unknown';
|
|
30
|
+
} catch { /* fallback to defaults */ }
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
let isRootless = false;
|
|
34
|
+
const infoResult = await smartshellInstance.execSilent(
|
|
35
|
+
`docker info --format '{{json .SecurityOptions}}'`
|
|
36
|
+
);
|
|
37
|
+
if (infoResult.exitCode === 0 && infoResult.stdout) {
|
|
38
|
+
isRootless = infoResult.stdout.includes('name=rootless');
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
this.contextInfo = { name, endpoint, isRootless, dockerHost: process.env.DOCKER_HOST };
|
|
42
|
+
return this.contextInfo;
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
/** Logs context info prominently. */
|
|
46
|
+
public logContextInfo(): void {
|
|
47
|
+
if (!this.contextInfo) return;
|
|
48
|
+
const { name, endpoint, isRootless, dockerHost } = this.contextInfo;
|
|
49
|
+
logger.log('info', '=== DOCKER CONTEXT ===');
|
|
50
|
+
logger.log('info', `Context: ${name}`);
|
|
51
|
+
logger.log('info', `Endpoint: ${endpoint}`);
|
|
52
|
+
if (dockerHost) logger.log('info', `DOCKER_HOST: ${dockerHost}`);
|
|
53
|
+
logger.log('info', `Rootless: ${isRootless ? 'yes' : 'no'}`);
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
/** Emits rootless-specific warnings. */
|
|
57
|
+
public logRootlessWarnings(): void {
|
|
58
|
+
if (!this.contextInfo?.isRootless) return;
|
|
59
|
+
logger.log('warn', '[rootless] network=host in buildx is namespaced by rootlesskit');
|
|
60
|
+
logger.log('warn', '[rootless] Local registry may have localhost vs 127.0.0.1 resolution quirks');
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
/** Returns context-aware builder name: tsdocker-builder-<context> */
|
|
64
|
+
public getBuilderName(): string {
|
|
65
|
+
const contextName = this.contextInfo?.name || 'default';
|
|
66
|
+
const sanitized = contextName.replace(/[^a-zA-Z0-9_-]/g, '-');
|
|
67
|
+
return `tsdocker-builder-${sanitized}`;
|
|
68
|
+
}
|
|
69
|
+
}
|