@git.zone/tsdocker 1.9.0 → 1.11.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.
@@ -3,7 +3,7 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@git.zone/tsdocker',
6
- version: '1.9.0',
6
+ version: '1.11.0',
7
7
  description: 'develop npm modules cross platform with docker'
8
8
  };
9
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxvQkFBb0I7SUFDMUIsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLGdEQUFnRDtDQUM5RCxDQUFBIn0=
9
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxvQkFBb0I7SUFDMUIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLGdEQUFnRDtDQUM5RCxDQUFBIn0=
@@ -17,6 +17,16 @@ export declare class Dockerfile {
17
17
  * Maps local Dockerfiles dependencies to the corresponding Dockerfile class instances
18
18
  */
19
19
  static mapDockerfiles(sortedDockerfileArray: Dockerfile[]): Promise<Dockerfile[]>;
20
+ /** Determines if a local registry is needed for buildx dependency resolution. */
21
+ static needsLocalRegistry(dockerfiles: Dockerfile[], options?: {
22
+ platform?: string;
23
+ }): boolean;
24
+ /** Starts a temporary registry:2 container on port 5234. */
25
+ static startLocalRegistry(): Promise<void>;
26
+ /** Stops and removes the temporary local registry container. */
27
+ static stopLocalRegistry(): Promise<void>;
28
+ /** Pushes a built image to the local registry for buildx consumption. */
29
+ static pushToLocalRegistry(dockerfile: Dockerfile): Promise<void>;
20
30
  /**
21
31
  * Builds the corresponding real docker image for each Dockerfile class instance
22
32
  */
@@ -74,6 +84,7 @@ export declare class Dockerfile {
74
84
  baseImage: string;
75
85
  localBaseImageDependent: boolean;
76
86
  localBaseDockerfile: Dockerfile;
87
+ localRegistryTag?: string;
77
88
  constructor(managerRefArg: TsDockerManager, options: IDockerfileOptions);
78
89
  /**
79
90
  * Builds the Dockerfile
@@ -6,6 +6,9 @@ import * as fs from 'fs';
6
6
  const smartshellInstance = new plugins.smartshell.Smartshell({
7
7
  executor: 'bash',
8
8
  });
9
+ const LOCAL_REGISTRY_PORT = 5234;
10
+ const LOCAL_REGISTRY_HOST = `localhost:${LOCAL_REGISTRY_PORT}`;
11
+ const LOCAL_REGISTRY_CONTAINER = 'tsdocker-local-registry';
9
12
  /**
10
13
  * Class Dockerfile represents a Dockerfile on disk
11
14
  */
@@ -112,29 +115,78 @@ export class Dockerfile {
112
115
  });
113
116
  return sortedDockerfileArray;
114
117
  }
118
+ /** Determines if a local registry is needed for buildx dependency resolution. */
119
+ static needsLocalRegistry(dockerfiles, options) {
120
+ const hasLocalDeps = dockerfiles.some(df => df.localBaseImageDependent);
121
+ if (!hasLocalDeps)
122
+ return false;
123
+ const config = dockerfiles[0]?.managerRef?.config;
124
+ return !!options?.platform || !!(config?.platforms && config.platforms.length > 1);
125
+ }
126
+ /** Starts a temporary registry:2 container on port 5234. */
127
+ static async startLocalRegistry() {
128
+ await smartshellInstance.execSilent(`docker rm -f ${LOCAL_REGISTRY_CONTAINER} 2>/dev/null || true`);
129
+ const result = await smartshellInstance.execSilent(`docker run -d --name ${LOCAL_REGISTRY_CONTAINER} -p ${LOCAL_REGISTRY_PORT}:5000 registry:2`);
130
+ if (result.exitCode !== 0) {
131
+ throw new Error(`Failed to start local registry: ${result.stderr || result.stdout}`);
132
+ }
133
+ // registry:2 starts near-instantly; brief wait for readiness
134
+ await new Promise(resolve => setTimeout(resolve, 1000));
135
+ logger.log('info', `Started local registry at ${LOCAL_REGISTRY_HOST}`);
136
+ }
137
+ /** Stops and removes the temporary local registry container. */
138
+ static async stopLocalRegistry() {
139
+ await smartshellInstance.execSilent(`docker rm -f ${LOCAL_REGISTRY_CONTAINER} 2>/dev/null || true`);
140
+ logger.log('info', 'Stopped local registry');
141
+ }
142
+ /** Pushes a built image to the local registry for buildx consumption. */
143
+ static async pushToLocalRegistry(dockerfile) {
144
+ const registryTag = `${LOCAL_REGISTRY_HOST}/${dockerfile.buildTag}`;
145
+ await smartshellInstance.execSilent(`docker tag ${dockerfile.buildTag} ${registryTag}`);
146
+ const result = await smartshellInstance.execSilent(`docker push ${registryTag}`);
147
+ if (result.exitCode !== 0) {
148
+ throw new Error(`Failed to push to local registry: ${result.stderr || result.stdout}`);
149
+ }
150
+ dockerfile.localRegistryTag = registryTag;
151
+ logger.log('info', `Pushed ${dockerfile.buildTag} to local registry as ${registryTag}`);
152
+ }
115
153
  /**
116
154
  * Builds the corresponding real docker image for each Dockerfile class instance
117
155
  */
118
156
  static async buildDockerfiles(sortedArrayArg, options) {
119
157
  const total = sortedArrayArg.length;
120
158
  const overallStart = Date.now();
121
- for (let i = 0; i < total; i++) {
122
- const dockerfileArg = sortedArrayArg[i];
123
- const progress = `(${i + 1}/${total})`;
124
- logger.log('info', `${progress} Building ${dockerfileArg.cleanTag}...`);
125
- const elapsed = await dockerfileArg.build(options);
126
- logger.log('ok', `${progress} Built ${dockerfileArg.cleanTag} in ${formatDuration(elapsed)}`);
127
- // Tag the built image with the full base image references used by dependent Dockerfiles,
128
- // so their FROM lines resolve to the locally-built image instead of pulling from a registry.
129
- const dependentBaseImages = new Set();
130
- for (const other of sortedArrayArg) {
131
- if (other.localBaseDockerfile === dockerfileArg && other.baseImage !== dockerfileArg.buildTag) {
132
- dependentBaseImages.add(other.baseImage);
159
+ const useRegistry = Dockerfile.needsLocalRegistry(sortedArrayArg, options);
160
+ if (useRegistry) {
161
+ await Dockerfile.startLocalRegistry();
162
+ }
163
+ try {
164
+ for (let i = 0; i < total; i++) {
165
+ const dockerfileArg = sortedArrayArg[i];
166
+ const progress = `(${i + 1}/${total})`;
167
+ logger.log('info', `${progress} Building ${dockerfileArg.cleanTag}...`);
168
+ const elapsed = await dockerfileArg.build(options);
169
+ logger.log('ok', `${progress} Built ${dockerfileArg.cleanTag} in ${formatDuration(elapsed)}`);
170
+ // Tag in host daemon for standard docker build compatibility
171
+ const dependentBaseImages = new Set();
172
+ for (const other of sortedArrayArg) {
173
+ if (other.localBaseDockerfile === dockerfileArg && other.baseImage !== dockerfileArg.buildTag) {
174
+ dependentBaseImages.add(other.baseImage);
175
+ }
176
+ }
177
+ for (const fullTag of dependentBaseImages) {
178
+ logger.log('info', `Tagging ${dockerfileArg.buildTag} as ${fullTag} for local dependency resolution`);
179
+ await smartshellInstance.exec(`docker tag ${dockerfileArg.buildTag} ${fullTag}`);
180
+ }
181
+ // Push to local registry for buildx dependency resolution
182
+ if (useRegistry && sortedArrayArg.some(other => other.localBaseDockerfile === dockerfileArg)) {
183
+ await Dockerfile.pushToLocalRegistry(dockerfileArg);
133
184
  }
134
185
  }
135
- for (const fullTag of dependentBaseImages) {
136
- logger.log('info', `Tagging ${dockerfileArg.buildTag} as ${fullTag} for local dependency resolution`);
137
- await smartshellInstance.exec(`docker tag ${dockerfileArg.buildTag} ${fullTag}`);
186
+ }
187
+ finally {
188
+ if (useRegistry) {
189
+ await Dockerfile.stopLocalRegistry();
138
190
  }
139
191
  }
140
192
  logger.log('info', `Total build time: ${formatDuration(Date.now() - overallStart)}`);
@@ -297,6 +349,7 @@ export class Dockerfile {
297
349
  baseImage;
298
350
  localBaseImageDependent;
299
351
  localBaseDockerfile;
352
+ localRegistryTag;
300
353
  constructor(managerRefArg, options) {
301
354
  this.managerRef = managerRefArg;
302
355
  this.filePath = options.filePath;
@@ -335,15 +388,25 @@ export class Dockerfile {
335
388
  const timeout = options?.timeout;
336
389
  const noCacheFlag = options?.noCache ? ' --no-cache' : '';
337
390
  const verbose = options?.verbose ?? false;
391
+ let buildContextFlag = '';
392
+ if (this.localBaseImageDependent && this.localBaseDockerfile) {
393
+ const fromImage = this.baseImage;
394
+ if (this.localBaseDockerfile.localRegistryTag) {
395
+ // BuildKit pulls from the local registry (reachable via host network)
396
+ const registryTag = this.localBaseDockerfile.localRegistryTag;
397
+ buildContextFlag = ` --build-context "${fromImage}=docker-image://${registryTag}"`;
398
+ logger.log('info', `Using local registry build context: ${fromImage} -> docker-image://${registryTag}`);
399
+ }
400
+ }
338
401
  let buildCommand;
339
402
  if (platformOverride) {
340
403
  // Single platform override via buildx
341
- buildCommand = `docker buildx build --platform ${platformOverride}${noCacheFlag} --load -t ${this.buildTag} -f ${this.filePath} ${buildArgsString} .`;
404
+ buildCommand = `docker buildx build --platform ${platformOverride}${noCacheFlag}${buildContextFlag} --load -t ${this.buildTag} -f ${this.filePath} ${buildArgsString} .`;
342
405
  }
343
406
  else if (config.platforms && config.platforms.length > 1) {
344
407
  // Multi-platform build using buildx
345
408
  const platformString = config.platforms.join(',');
346
- buildCommand = `docker buildx build --platform ${platformString}${noCacheFlag} -t ${this.buildTag} -f ${this.filePath} ${buildArgsString} .`;
409
+ buildCommand = `docker buildx build --platform ${platformString}${noCacheFlag}${buildContextFlag} -t ${this.buildTag} -f ${this.filePath} ${buildArgsString} .`;
347
410
  if (config.push) {
348
411
  buildCommand += ' --push';
349
412
  }
@@ -449,4 +512,4 @@ export class Dockerfile {
449
512
  return result.stdout.trim();
450
513
  }
451
514
  }
452
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.dockerfile.js","sourceRoot":"","sources":["../ts/classes.dockerfile.ts"],"names":[],"mappings":"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"}
515
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.dockerfile.js","sourceRoot":"","sources":["../ts/classes.dockerfile.ts"],"names":[],"mappings":"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"}
@@ -130,40 +130,53 @@ export class TsDockerManager {
130
130
  cache.load();
131
131
  const total = toBuild.length;
132
132
  const overallStart = Date.now();
133
- for (let i = 0; i < total; i++) {
134
- const dockerfileArg = toBuild[i];
135
- const progress = `(${i + 1}/${total})`;
136
- const skip = await cache.shouldSkipBuild(dockerfileArg.cleanTag, dockerfileArg.content);
137
- if (skip) {
138
- logger.log('ok', `${progress} Skipped ${dockerfileArg.cleanTag} (cached)`);
139
- continue;
140
- }
141
- // Cache miss — build this Dockerfile
142
- logger.log('info', `${progress} Building ${dockerfileArg.cleanTag}...`);
143
- const elapsed = await dockerfileArg.build({
144
- platform: options?.platform,
145
- timeout: options?.timeout,
146
- noCache: options?.noCache,
147
- verbose: options?.verbose,
148
- });
149
- logger.log('ok', `${progress} Built ${dockerfileArg.cleanTag} in ${formatDuration(elapsed)}`);
150
- const imageId = await dockerfileArg.getId();
151
- cache.recordBuild(dockerfileArg.cleanTag, dockerfileArg.content, imageId, dockerfileArg.buildTag);
133
+ const useRegistry = Dockerfile.needsLocalRegistry(toBuild, options);
134
+ if (useRegistry) {
135
+ await Dockerfile.startLocalRegistry();
152
136
  }
153
- logger.log('info', `Total build time: ${formatDuration(Date.now() - overallStart)}`);
154
- // Perform dependency tagging for all Dockerfiles (even cache hits, since tags may be stale)
155
- for (const dockerfileArg of toBuild) {
156
- const dependentBaseImages = new Set();
157
- for (const other of toBuild) {
158
- if (other.localBaseDockerfile === dockerfileArg && other.baseImage !== dockerfileArg.buildTag) {
159
- dependentBaseImages.add(other.baseImage);
137
+ try {
138
+ for (let i = 0; i < total; i++) {
139
+ const dockerfileArg = toBuild[i];
140
+ const progress = `(${i + 1}/${total})`;
141
+ const skip = await cache.shouldSkipBuild(dockerfileArg.cleanTag, dockerfileArg.content);
142
+ if (skip) {
143
+ logger.log('ok', `${progress} Skipped ${dockerfileArg.cleanTag} (cached)`);
144
+ }
145
+ else {
146
+ logger.log('info', `${progress} Building ${dockerfileArg.cleanTag}...`);
147
+ const elapsed = await dockerfileArg.build({
148
+ platform: options?.platform,
149
+ timeout: options?.timeout,
150
+ noCache: options?.noCache,
151
+ verbose: options?.verbose,
152
+ });
153
+ logger.log('ok', `${progress} Built ${dockerfileArg.cleanTag} in ${formatDuration(elapsed)}`);
154
+ const imageId = await dockerfileArg.getId();
155
+ cache.recordBuild(dockerfileArg.cleanTag, dockerfileArg.content, imageId, dockerfileArg.buildTag);
156
+ }
157
+ // Tag for dependents IMMEDIATELY (not after all builds)
158
+ const dependentBaseImages = new Set();
159
+ for (const other of toBuild) {
160
+ if (other.localBaseDockerfile === dockerfileArg && other.baseImage !== dockerfileArg.buildTag) {
161
+ dependentBaseImages.add(other.baseImage);
162
+ }
163
+ }
164
+ for (const fullTag of dependentBaseImages) {
165
+ logger.log('info', `Tagging ${dockerfileArg.buildTag} as ${fullTag} for local dependency resolution`);
166
+ await smartshellInstance.exec(`docker tag ${dockerfileArg.buildTag} ${fullTag}`);
167
+ }
168
+ // Push to local registry for buildx (even for cache hits — image exists but registry doesn't)
169
+ if (useRegistry && toBuild.some(other => other.localBaseDockerfile === dockerfileArg)) {
170
+ await Dockerfile.pushToLocalRegistry(dockerfileArg);
160
171
  }
161
172
  }
162
- for (const fullTag of dependentBaseImages) {
163
- logger.log('info', `Tagging ${dockerfileArg.buildTag} as ${fullTag} for local dependency resolution`);
164
- await smartshellInstance.exec(`docker tag ${dockerfileArg.buildTag} ${fullTag}`);
173
+ }
174
+ finally {
175
+ if (useRegistry) {
176
+ await Dockerfile.stopLocalRegistry();
165
177
  }
166
178
  }
179
+ logger.log('info', `Total build time: ${formatDuration(Date.now() - overallStart)}`);
167
180
  cache.save();
168
181
  }
169
182
  else {
@@ -201,17 +214,23 @@ export class TsDockerManager {
201
214
  */
202
215
  async ensureBuildx() {
203
216
  logger.log('info', 'Setting up Docker buildx for multi-platform builds...');
204
- // Check if a buildx builder exists
205
217
  const inspectResult = await smartshellInstance.exec('docker buildx inspect tsdocker-builder 2>/dev/null');
206
218
  if (inspectResult.exitCode !== 0) {
207
- // Create a new buildx builder
208
- logger.log('info', 'Creating new buildx builder...');
209
- await smartshellInstance.exec('docker buildx create --name tsdocker-builder --use');
219
+ logger.log('info', 'Creating new buildx builder with host network...');
220
+ await smartshellInstance.exec('docker buildx create --name tsdocker-builder --driver docker-container --driver-opt network=host --use');
210
221
  await smartshellInstance.exec('docker buildx inspect --bootstrap');
211
222
  }
212
223
  else {
213
- // Use existing builder
214
- await smartshellInstance.exec('docker buildx use tsdocker-builder');
224
+ const inspectOutput = inspectResult.stdout || '';
225
+ if (!inspectOutput.includes('network=host')) {
226
+ logger.log('info', 'Recreating buildx builder with host network (migration)...');
227
+ await smartshellInstance.exec('docker buildx rm tsdocker-builder 2>/dev/null');
228
+ await smartshellInstance.exec('docker buildx create --name tsdocker-builder --driver docker-container --driver-opt network=host --use');
229
+ await smartshellInstance.exec('docker buildx inspect --bootstrap');
230
+ }
231
+ else {
232
+ await smartshellInstance.exec('docker buildx use tsdocker-builder');
233
+ }
215
234
  }
216
235
  logger.log('ok', 'Docker buildx ready');
217
236
  }
@@ -319,4 +338,4 @@ export class TsDockerManager {
319
338
  return this.dockerfiles;
320
339
  }
321
340
  }
322
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.tsdockermanager.js","sourceRoot":"","sources":["../ts/classes.tsdockermanager.ts"],"names":[],"mappings":"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"}
341
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.tsdockermanager.js","sourceRoot":"","sources":["../ts/classes.tsdockermanager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,uBAAuB,CAAC;AACjD,OAAO,KAAK,KAAK,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAG3D,MAAM,kBAAkB,GAAG,IAAI,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC;IAC3D,QAAQ,EAAE,MAAM;CACjB,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,OAAO,eAAe;IACnB,eAAe,CAAkB;IACjC,MAAM,CAAkB;IACxB,WAAW,CAAM;IAChB,WAAW,GAAiB,EAAE,CAAC;IAEvC,YAAY,MAAuB;QACjC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;IAC/C,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,OAAO;QAClB,oBAAoB;QACpB,IAAI,CAAC;YACH,MAAM,mBAAmB,GAAG,IAAI,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC3E,IAAI,CAAC,WAAW,GAAG;gBACjB,GAAG,EAAE;oBACH,IAAI,EAAE,mBAAmB,CAAC,GAAG,CAAC,IAAI;oBAClC,OAAO,EAAE,mBAAmB,CAAC,GAAG,CAAC,OAAO;iBACzC;aACF,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,6BAA6B,CAAC,CAAC;YAClD,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QAC1B,CAAC;QAED,mCAAmC;QACnC,IAAI,CAAC,eAAe,CAAC,WAAW,EAAE,CAAC;QAEnC,0CAA0C;QAC1C,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;YAC3B,KAAK,MAAM,WAAW,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;gBACjD,mCAAmC;gBACnC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,gBAAgB,CAAC,WAAW,CAAC,EAAE,CAAC;oBACxD,qDAAqD;oBACrD,MAAM,UAAU,GAAG,WAAW,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;oBACjE,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,UAAU,EAAE,CAAC,CAAC;oBAC/D,IAAI,SAAS,EAAE,CAAC;wBACd,IAAI,CAAC;4BACH,MAAM,QAAQ,GAAG,cAAc,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;4BACzD,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;wBAC7C,CAAC;wBAAC,OAAO,GAAG,EAAE,CAAC;4BACb,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,2CAA2C,WAAW,EAAE,CAAC,CAAC;wBAC/E,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,iCAAiC,IAAI,CAAC,eAAe,CAAC,gBAAgB,EAAE,CAAC,MAAM,aAAa,CAAC,CAAC;IACnH,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,KAAK;QAChB,IAAI,IAAI,CAAC,eAAe,CAAC,gBAAgB,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAC;YAC/C,OAAO;QACT,CAAC;QACD,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC;IACxC,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,mBAAmB;QAC9B,IAAI,CAAC,WAAW,GAAG,MAAM,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAC1D,IAAI,CAAC,WAAW,GAAG,MAAM,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACtE,IAAI,CAAC,WAAW,GAAG,MAAM,UAAU,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACrE,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,KAAK,CAAC,OAA8B;QAC/C,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAClC,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACnC,CAAC;QAED,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAClC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;YAC3C,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,uCAAuC;QACvC,IAAI,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC;QAE/B,IAAI,OAAO,EAAE,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrD,iCAAiC;YACjC,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE;gBAC7C,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;gBACpD,OAAO,OAAO,CAAC,QAAS,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;oBACxC,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;wBACnD,gCAAgC;wBAChC,MAAM,QAAQ,GAAG,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,GAAG,CAAC;wBAC9E,OAAO,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;oBAC7C,CAAC;oBACD,OAAO,QAAQ,KAAK,OAAO,CAAC;gBAC9B,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YAEH,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACzB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,oCAAoC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBACtF,OAAO,EAAE,CAAC;YACZ,CAAC;YAED,0DAA0D;YAC1D,OAAO,GAAG,IAAI,CAAC,uBAAuB,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;YAClE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,OAAO,CAAC,MAAM,4BAA4B,OAAO,CAAC,MAAM,2BAA2B,CAAC,CAAC;QACrH,CAAC;QAED,4BAA4B;QAC5B,IAAI,OAAO,EAAE,QAAQ,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC;YACrF,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAC5B,CAAC;QAED,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QACvB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;QAC1C,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,YAAY,OAAO,CAAC,MAAM,mBAAmB,CAAC,CAAC;QAElE,IAAI,OAAO,EAAE,MAAM,EAAE,CAAC;YACpB,6DAA6D;YAC7D,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;YAC3C,MAAM,KAAK,GAAG,IAAI,aAAa,EAAE,CAAC;YAClC,KAAK,CAAC,IAAI,EAAE,CAAC;YAEb,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC;YAC7B,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAChC,MAAM,WAAW,GAAG,UAAU,CAAC,kBAAkB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAEpE,IAAI,WAAW,EAAE,CAAC;gBAChB,MAAM,UAAU,CAAC,kBAAkB,EAAE,CAAC;YACxC,CAAC;YAED,IAAI,CAAC;gBACH,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC;oBAC/B,MAAM,aAAa,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;oBACjC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,GAAG,CAAC;oBACvC,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,eAAe,CAAC,aAAa,CAAC,QAAQ,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;oBAExF,IAAI,IAAI,EAAE,CAAC;wBACT,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,QAAQ,YAAY,aAAa,CAAC,QAAQ,WAAW,CAAC,CAAC;oBAC7E,CAAC;yBAAM,CAAC;wBACN,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,QAAQ,aAAa,aAAa,CAAC,QAAQ,KAAK,CAAC,CAAC;wBACxE,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,KAAK,CAAC;4BACxC,QAAQ,EAAE,OAAO,EAAE,QAAQ;4BAC3B,OAAO,EAAE,OAAO,EAAE,OAAO;4BACzB,OAAO,EAAE,OAAO,EAAE,OAAO;4BACzB,OAAO,EAAE,OAAO,EAAE,OAAO;yBAC1B,CAAC,CAAC;wBACH,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,QAAQ,UAAU,aAAa,CAAC,QAAQ,OAAO,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;wBAC9F,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,KAAK,EAAE,CAAC;wBAC5C,KAAK,CAAC,WAAW,CAAC,aAAa,CAAC,QAAQ,EAAE,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC;oBACpG,CAAC;oBAED,wDAAwD;oBACxD,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAAU,CAAC;oBAC9C,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;wBAC5B,IAAI,KAAK,CAAC,mBAAmB,KAAK,aAAa,IAAI,KAAK,CAAC,SAAS,KAAK,aAAa,CAAC,QAAQ,EAAE,CAAC;4BAC9F,mBAAmB,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;wBAC3C,CAAC;oBACH,CAAC;oBACD,KAAK,MAAM,OAAO,IAAI,mBAAmB,EAAE,CAAC;wBAC1C,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,aAAa,CAAC,QAAQ,OAAO,OAAO,kCAAkC,CAAC,CAAC;wBACtG,MAAM,kBAAkB,CAAC,IAAI,CAAC,cAAc,aAAa,CAAC,QAAQ,IAAI,OAAO,EAAE,CAAC,CAAC;oBACnF,CAAC;oBAED,8FAA8F;oBAC9F,IAAI,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,mBAAmB,KAAK,aAAa,CAAC,EAAE,CAAC;wBACtF,MAAM,UAAU,CAAC,mBAAmB,CAAC,aAAa,CAAC,CAAC;oBACtD,CAAC;gBACH,CAAC;YACH,CAAC;oBAAS,CAAC;gBACT,IAAI,WAAW,EAAE,CAAC;oBAChB,MAAM,UAAU,CAAC,iBAAiB,EAAE,CAAC;gBACvC,CAAC;YACH,CAAC;YAED,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,qBAAqB,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,YAAY,CAAC,EAAE,CAAC,CAAC;YACrF,KAAK,CAAC,IAAI,EAAE,CAAC;QACf,CAAC;aAAM,CAAC;YACN,qDAAqD;YACrD,MAAM,UAAU,CAAC,gBAAgB,CAAC,OAAO,EAAE;gBACzC,QAAQ,EAAE,OAAO,EAAE,QAAQ;gBAC3B,OAAO,EAAE,OAAO,EAAE,OAAO;gBACzB,OAAO,EAAE,OAAO,EAAE,OAAO;gBACzB,OAAO,EAAE,OAAO,EAAE,OAAO;aAC1B,CAAC,CAAC;QACL,CAAC;QAED,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,oCAAoC,CAAC,CAAC;QAE5D,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;;;OAGG;IACK,uBAAuB,CAAC,OAAqB,EAAE,SAAuB;QAC5E,MAAM,MAAM,GAAG,IAAI,GAAG,EAAc,CAAC;QACrC,MAAM,WAAW,GAAG,CAAC,EAAc,EAAE,EAAE;YACrC,IAAI,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;gBAAE,OAAO;YAC3B,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACf,IAAI,EAAE,CAAC,uBAAuB,IAAI,EAAE,CAAC,mBAAmB,EAAE,CAAC;gBACzD,WAAW,CAAC,EAAE,CAAC,mBAAmB,CAAC,CAAC;YACtC,CAAC;QACH,CAAC,CAAC;QACF,KAAK,MAAM,EAAE,IAAI,OAAO;YAAE,WAAW,CAAC,EAAE,CAAC,CAAC;QAC1C,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IAClD,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,YAAY;QACxB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,uDAAuD,CAAC,CAAC;QAC5E,MAAM,aAAa,GAAG,MAAM,kBAAkB,CAAC,IAAI,CAAC,oDAAoD,CAAC,CAAC;QAE1G,IAAI,aAAa,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;YACjC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,kDAAkD,CAAC,CAAC;YACvE,MAAM,kBAAkB,CAAC,IAAI,CAC3B,wGAAwG,CACzG,CAAC;YACF,MAAM,kBAAkB,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;QACrE,CAAC;aAAM,CAAC;YACN,MAAM,aAAa,GAAG,aAAa,CAAC,MAAM,IAAI,EAAE,CAAC;YACjD,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;gBAC5C,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,4DAA4D,CAAC,CAAC;gBACjF,MAAM,kBAAkB,CAAC,IAAI,CAAC,+CAA+C,CAAC,CAAC;gBAC/E,MAAM,kBAAkB,CAAC,IAAI,CAC3B,wGAAwG,CACzG,CAAC;gBACF,MAAM,kBAAkB,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;YACrE,CAAC;iBAAM,CAAC;gBACN,MAAM,kBAAkB,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC;YACtE,CAAC;QACH,CAAC;QACD,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;IAC1C,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,IAAI,CAAC,YAAuB;QACvC,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAClC,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACnC,CAAC;QAED,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAClC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,8BAA8B,CAAC,CAAC;YACnD,OAAO;QACT,CAAC;QAED,wCAAwC;QACxC,IAAI,gBAAgB,GAAqB,EAAE,CAAC;QAE5C,IAAI,YAAY,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5C,+BAA+B;YAC/B,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC;gBAC/B,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;gBAC5D,IAAI,QAAQ,EAAE,CAAC;oBACb,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAClC,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,YAAY,GAAG,uBAAuB,CAAC,CAAC;gBAC7D,CAAC;YACH,CAAC;QACH,CAAC;aAAM,CAAC;YACN,oCAAoC;YACpC,gBAAgB,GAAG,IAAI,CAAC,eAAe,CAAC,gBAAgB,EAAE,CAAC;QAC7D,CAAC;QAED,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAClC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,oCAAoC,CAAC,CAAC;YACzD,OAAO;QACT,CAAC;QAED,wCAAwC;QACxC,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YAC1C,KAAK,MAAM,QAAQ,IAAI,gBAAgB,EAAE,CAAC;gBACxC,MAAM,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAClC,CAAC;QACH,CAAC;QAED,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,gCAAgC,CAAC,CAAC;IAC1D,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,IAAI,CAAC,WAAmB;QACnC,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAClC,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACnC,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QACpE,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,YAAY,WAAW,YAAY,CAAC,CAAC;QACvD,CAAC;QAED,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YAC1C,MAAM,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAClC,CAAC;QAED,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,gCAAgC,CAAC,CAAC;IAC1D,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,IAAI;QACf,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAClC,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACnC,CAAC;QAED,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAClC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,8BAA8B,CAAC,CAAC;YACnD,OAAO;QACT,CAAC;QAED,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QACvB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;QACzC,MAAM,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACnD,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,qBAAqB,CAAC,CAAC;IAC/C,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,IAAI;QACf,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAClC,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACnC,CAAC;QAED,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QACvB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAC;QAC9C,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAC;QAC/C,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAEvB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACjD,MAAM,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;YAC/B,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC/C,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC7C,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,kBAAkB,EAAE,CAAC,SAAS,EAAE,CAAC,CAAC;YACrD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;YAChD,IAAI,EAAE,CAAC,uBAAuB,EAAE,CAAC;gBAC/B,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,kBAAkB,EAAE,CAAC,mBAAmB,EAAE,QAAQ,EAAE,CAAC,CAAC;YAC3E,CAAC;YACD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QACzB,CAAC;QAED,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED;;OAEG;IACI,cAAc;QACnB,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;CACF"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@git.zone/tsdocker",
3
- "version": "1.9.0",
3
+ "version": "1.11.0",
4
4
  "private": false,
5
5
  "description": "develop npm modules cross platform with docker",
6
6
  "main": "dist_ts/index.js",
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@git.zone/tsdocker',
6
- version: '1.9.0',
6
+ version: '1.11.0',
7
7
  description: 'develop npm modules cross platform with docker'
8
8
  }
@@ -10,6 +10,10 @@ const smartshellInstance = new plugins.smartshell.Smartshell({
10
10
  executor: 'bash',
11
11
  });
12
12
 
13
+ const LOCAL_REGISTRY_PORT = 5234;
14
+ const LOCAL_REGISTRY_HOST = `localhost:${LOCAL_REGISTRY_PORT}`;
15
+ const LOCAL_REGISTRY_CONTAINER = 'tsdocker-local-registry';
16
+
13
17
  /**
14
18
  * Class Dockerfile represents a Dockerfile on disk
15
19
  */
@@ -135,6 +139,53 @@ export class Dockerfile {
135
139
  return sortedDockerfileArray;
136
140
  }
137
141
 
142
+ /** Determines if a local registry is needed for buildx dependency resolution. */
143
+ public static needsLocalRegistry(
144
+ dockerfiles: Dockerfile[],
145
+ options?: { platform?: string },
146
+ ): boolean {
147
+ const hasLocalDeps = dockerfiles.some(df => df.localBaseImageDependent);
148
+ if (!hasLocalDeps) return false;
149
+ const config = dockerfiles[0]?.managerRef?.config;
150
+ return !!options?.platform || !!(config?.platforms && config.platforms.length > 1);
151
+ }
152
+
153
+ /** Starts a temporary registry:2 container on port 5234. */
154
+ public static async startLocalRegistry(): Promise<void> {
155
+ await smartshellInstance.execSilent(
156
+ `docker rm -f ${LOCAL_REGISTRY_CONTAINER} 2>/dev/null || true`
157
+ );
158
+ const result = await smartshellInstance.execSilent(
159
+ `docker run -d --name ${LOCAL_REGISTRY_CONTAINER} -p ${LOCAL_REGISTRY_PORT}:5000 registry:2`
160
+ );
161
+ if (result.exitCode !== 0) {
162
+ throw new Error(`Failed to start local registry: ${result.stderr || result.stdout}`);
163
+ }
164
+ // registry:2 starts near-instantly; brief wait for readiness
165
+ await new Promise(resolve => setTimeout(resolve, 1000));
166
+ logger.log('info', `Started local registry at ${LOCAL_REGISTRY_HOST}`);
167
+ }
168
+
169
+ /** Stops and removes the temporary local registry container. */
170
+ public static async stopLocalRegistry(): Promise<void> {
171
+ await smartshellInstance.execSilent(
172
+ `docker rm -f ${LOCAL_REGISTRY_CONTAINER} 2>/dev/null || true`
173
+ );
174
+ logger.log('info', 'Stopped local registry');
175
+ }
176
+
177
+ /** Pushes a built image to the local registry for buildx consumption. */
178
+ public static async pushToLocalRegistry(dockerfile: Dockerfile): Promise<void> {
179
+ const registryTag = `${LOCAL_REGISTRY_HOST}/${dockerfile.buildTag}`;
180
+ await smartshellInstance.execSilent(`docker tag ${dockerfile.buildTag} ${registryTag}`);
181
+ const result = await smartshellInstance.execSilent(`docker push ${registryTag}`);
182
+ if (result.exitCode !== 0) {
183
+ throw new Error(`Failed to push to local registry: ${result.stderr || result.stdout}`);
184
+ }
185
+ dockerfile.localRegistryTag = registryTag;
186
+ logger.log('info', `Pushed ${dockerfile.buildTag} to local registry as ${registryTag}`);
187
+ }
188
+
138
189
  /**
139
190
  * Builds the corresponding real docker image for each Dockerfile class instance
140
191
  */
@@ -144,26 +195,41 @@ export class Dockerfile {
144
195
  ): Promise<Dockerfile[]> {
145
196
  const total = sortedArrayArg.length;
146
197
  const overallStart = Date.now();
198
+ const useRegistry = Dockerfile.needsLocalRegistry(sortedArrayArg, options);
147
199
 
148
- for (let i = 0; i < total; i++) {
149
- const dockerfileArg = sortedArrayArg[i];
150
- const progress = `(${i + 1}/${total})`;
151
- logger.log('info', `${progress} Building ${dockerfileArg.cleanTag}...`);
200
+ if (useRegistry) {
201
+ await Dockerfile.startLocalRegistry();
202
+ }
152
203
 
153
- const elapsed = await dockerfileArg.build(options);
154
- logger.log('ok', `${progress} Built ${dockerfileArg.cleanTag} in ${formatDuration(elapsed)}`);
204
+ try {
205
+ for (let i = 0; i < total; i++) {
206
+ const dockerfileArg = sortedArrayArg[i];
207
+ const progress = `(${i + 1}/${total})`;
208
+ logger.log('info', `${progress} Building ${dockerfileArg.cleanTag}...`);
209
+
210
+ const elapsed = await dockerfileArg.build(options);
211
+ logger.log('ok', `${progress} Built ${dockerfileArg.cleanTag} in ${formatDuration(elapsed)}`);
212
+
213
+ // Tag in host daemon for standard docker build compatibility
214
+ const dependentBaseImages = new Set<string>();
215
+ for (const other of sortedArrayArg) {
216
+ if (other.localBaseDockerfile === dockerfileArg && other.baseImage !== dockerfileArg.buildTag) {
217
+ dependentBaseImages.add(other.baseImage);
218
+ }
219
+ }
220
+ for (const fullTag of dependentBaseImages) {
221
+ logger.log('info', `Tagging ${dockerfileArg.buildTag} as ${fullTag} for local dependency resolution`);
222
+ await smartshellInstance.exec(`docker tag ${dockerfileArg.buildTag} ${fullTag}`);
223
+ }
155
224
 
156
- // Tag the built image with the full base image references used by dependent Dockerfiles,
157
- // so their FROM lines resolve to the locally-built image instead of pulling from a registry.
158
- const dependentBaseImages = new Set<string>();
159
- for (const other of sortedArrayArg) {
160
- if (other.localBaseDockerfile === dockerfileArg && other.baseImage !== dockerfileArg.buildTag) {
161
- dependentBaseImages.add(other.baseImage);
225
+ // Push to local registry for buildx dependency resolution
226
+ if (useRegistry && sortedArrayArg.some(other => other.localBaseDockerfile === dockerfileArg)) {
227
+ await Dockerfile.pushToLocalRegistry(dockerfileArg);
162
228
  }
163
229
  }
164
- for (const fullTag of dependentBaseImages) {
165
- logger.log('info', `Tagging ${dockerfileArg.buildTag} as ${fullTag} for local dependency resolution`);
166
- await smartshellInstance.exec(`docker tag ${dockerfileArg.buildTag} ${fullTag}`);
230
+ } finally {
231
+ if (useRegistry) {
232
+ await Dockerfile.stopLocalRegistry();
167
233
  }
168
234
  }
169
235
 
@@ -366,6 +432,7 @@ export class Dockerfile {
366
432
  public baseImage: string;
367
433
  public localBaseImageDependent: boolean;
368
434
  public localBaseDockerfile!: Dockerfile;
435
+ public localRegistryTag?: string;
369
436
 
370
437
  constructor(managerRefArg: TsDockerManager, options: IDockerfileOptions) {
371
438
  this.managerRef = managerRefArg;
@@ -409,15 +476,26 @@ export class Dockerfile {
409
476
  const noCacheFlag = options?.noCache ? ' --no-cache' : '';
410
477
  const verbose = options?.verbose ?? false;
411
478
 
479
+ let buildContextFlag = '';
480
+ if (this.localBaseImageDependent && this.localBaseDockerfile) {
481
+ const fromImage = this.baseImage;
482
+ if (this.localBaseDockerfile.localRegistryTag) {
483
+ // BuildKit pulls from the local registry (reachable via host network)
484
+ const registryTag = this.localBaseDockerfile.localRegistryTag;
485
+ buildContextFlag = ` --build-context "${fromImage}=docker-image://${registryTag}"`;
486
+ logger.log('info', `Using local registry build context: ${fromImage} -> docker-image://${registryTag}`);
487
+ }
488
+ }
489
+
412
490
  let buildCommand: string;
413
491
 
414
492
  if (platformOverride) {
415
493
  // Single platform override via buildx
416
- buildCommand = `docker buildx build --platform ${platformOverride}${noCacheFlag} --load -t ${this.buildTag} -f ${this.filePath} ${buildArgsString} .`;
494
+ buildCommand = `docker buildx build --platform ${platformOverride}${noCacheFlag}${buildContextFlag} --load -t ${this.buildTag} -f ${this.filePath} ${buildArgsString} .`;
417
495
  } else if (config.platforms && config.platforms.length > 1) {
418
496
  // Multi-platform build using buildx
419
497
  const platformString = config.platforms.join(',');
420
- buildCommand = `docker buildx build --platform ${platformString}${noCacheFlag} -t ${this.buildTag} -f ${this.filePath} ${buildArgsString} .`;
498
+ buildCommand = `docker buildx build --platform ${platformString}${noCacheFlag}${buildContextFlag} -t ${this.buildTag} -f ${this.filePath} ${buildArgsString} .`;
421
499
 
422
500
  if (config.push) {
423
501
  buildCommand += ' --push';
@@ -148,46 +148,57 @@ export class TsDockerManager {
148
148
 
149
149
  const total = toBuild.length;
150
150
  const overallStart = Date.now();
151
+ const useRegistry = Dockerfile.needsLocalRegistry(toBuild, options);
151
152
 
152
- for (let i = 0; i < total; i++) {
153
- const dockerfileArg = toBuild[i];
154
- const progress = `(${i + 1}/${total})`;
155
- const skip = await cache.shouldSkipBuild(dockerfileArg.cleanTag, dockerfileArg.content);
156
- if (skip) {
157
- logger.log('ok', `${progress} Skipped ${dockerfileArg.cleanTag} (cached)`);
158
- continue;
159
- }
160
-
161
- // Cache miss — build this Dockerfile
162
- logger.log('info', `${progress} Building ${dockerfileArg.cleanTag}...`);
163
- const elapsed = await dockerfileArg.build({
164
- platform: options?.platform,
165
- timeout: options?.timeout,
166
- noCache: options?.noCache,
167
- verbose: options?.verbose,
168
- });
169
- logger.log('ok', `${progress} Built ${dockerfileArg.cleanTag} in ${formatDuration(elapsed)}`);
170
-
171
- const imageId = await dockerfileArg.getId();
172
- cache.recordBuild(dockerfileArg.cleanTag, dockerfileArg.content, imageId, dockerfileArg.buildTag);
153
+ if (useRegistry) {
154
+ await Dockerfile.startLocalRegistry();
173
155
  }
174
156
 
175
- logger.log('info', `Total build time: ${formatDuration(Date.now() - overallStart)}`);
157
+ try {
158
+ for (let i = 0; i < total; i++) {
159
+ const dockerfileArg = toBuild[i];
160
+ const progress = `(${i + 1}/${total})`;
161
+ const skip = await cache.shouldSkipBuild(dockerfileArg.cleanTag, dockerfileArg.content);
162
+
163
+ if (skip) {
164
+ logger.log('ok', `${progress} Skipped ${dockerfileArg.cleanTag} (cached)`);
165
+ } else {
166
+ logger.log('info', `${progress} Building ${dockerfileArg.cleanTag}...`);
167
+ const elapsed = await dockerfileArg.build({
168
+ platform: options?.platform,
169
+ timeout: options?.timeout,
170
+ noCache: options?.noCache,
171
+ verbose: options?.verbose,
172
+ });
173
+ logger.log('ok', `${progress} Built ${dockerfileArg.cleanTag} in ${formatDuration(elapsed)}`);
174
+ const imageId = await dockerfileArg.getId();
175
+ cache.recordBuild(dockerfileArg.cleanTag, dockerfileArg.content, imageId, dockerfileArg.buildTag);
176
+ }
177
+
178
+ // Tag for dependents IMMEDIATELY (not after all builds)
179
+ const dependentBaseImages = new Set<string>();
180
+ for (const other of toBuild) {
181
+ if (other.localBaseDockerfile === dockerfileArg && other.baseImage !== dockerfileArg.buildTag) {
182
+ dependentBaseImages.add(other.baseImage);
183
+ }
184
+ }
185
+ for (const fullTag of dependentBaseImages) {
186
+ logger.log('info', `Tagging ${dockerfileArg.buildTag} as ${fullTag} for local dependency resolution`);
187
+ await smartshellInstance.exec(`docker tag ${dockerfileArg.buildTag} ${fullTag}`);
188
+ }
176
189
 
177
- // Perform dependency tagging for all Dockerfiles (even cache hits, since tags may be stale)
178
- for (const dockerfileArg of toBuild) {
179
- const dependentBaseImages = new Set<string>();
180
- for (const other of toBuild) {
181
- if (other.localBaseDockerfile === dockerfileArg && other.baseImage !== dockerfileArg.buildTag) {
182
- dependentBaseImages.add(other.baseImage);
190
+ // Push to local registry for buildx (even for cache hits image exists but registry doesn't)
191
+ if (useRegistry && toBuild.some(other => other.localBaseDockerfile === dockerfileArg)) {
192
+ await Dockerfile.pushToLocalRegistry(dockerfileArg);
183
193
  }
184
194
  }
185
- for (const fullTag of dependentBaseImages) {
186
- logger.log('info', `Tagging ${dockerfileArg.buildTag} as ${fullTag} for local dependency resolution`);
187
- await smartshellInstance.exec(`docker tag ${dockerfileArg.buildTag} ${fullTag}`);
195
+ } finally {
196
+ if (useRegistry) {
197
+ await Dockerfile.stopLocalRegistry();
188
198
  }
189
199
  }
190
200
 
201
+ logger.log('info', `Total build time: ${formatDuration(Date.now() - overallStart)}`);
191
202
  cache.save();
192
203
  } else {
193
204
  // === STANDARD MODE: build all via static helper ===
@@ -226,20 +237,27 @@ export class TsDockerManager {
226
237
  */
227
238
  private async ensureBuildx(): Promise<void> {
228
239
  logger.log('info', 'Setting up Docker buildx for multi-platform builds...');
229
-
230
- // Check if a buildx builder exists
231
240
  const inspectResult = await smartshellInstance.exec('docker buildx inspect tsdocker-builder 2>/dev/null');
232
241
 
233
242
  if (inspectResult.exitCode !== 0) {
234
- // Create a new buildx builder
235
- logger.log('info', 'Creating new buildx builder...');
236
- await smartshellInstance.exec('docker buildx create --name tsdocker-builder --use');
243
+ logger.log('info', 'Creating new buildx builder with host network...');
244
+ await smartshellInstance.exec(
245
+ 'docker buildx create --name tsdocker-builder --driver docker-container --driver-opt network=host --use'
246
+ );
237
247
  await smartshellInstance.exec('docker buildx inspect --bootstrap');
238
248
  } else {
239
- // Use existing builder
240
- await smartshellInstance.exec('docker buildx use tsdocker-builder');
249
+ const inspectOutput = inspectResult.stdout || '';
250
+ if (!inspectOutput.includes('network=host')) {
251
+ logger.log('info', 'Recreating buildx builder with host network (migration)...');
252
+ await smartshellInstance.exec('docker buildx rm tsdocker-builder 2>/dev/null');
253
+ await smartshellInstance.exec(
254
+ 'docker buildx create --name tsdocker-builder --driver docker-container --driver-opt network=host --use'
255
+ );
256
+ await smartshellInstance.exec('docker buildx inspect --bootstrap');
257
+ } else {
258
+ await smartshellInstance.exec('docker buildx use tsdocker-builder');
259
+ }
241
260
  }
242
-
243
261
  logger.log('ok', 'Docker buildx ready');
244
262
  }
245
263