@git.zone/tsdocker 1.14.0 → 1.15.1

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.
@@ -5,6 +5,7 @@ import * as ConfigModule from './tsdocker.config.js';
5
5
  import * as DockerModule from './tsdocker.docker.js';
6
6
  import { logger, ora } from './tsdocker.logging.js';
7
7
  import { TsDockerManager } from './classes.tsdockermanager.js';
8
+ import { DockerContext } from './classes.dockercontext.js';
8
9
  import { commitinfo } from './00_commitinfo_data.js';
9
10
  const tsdockerCli = new plugins.smartcli.Smartcli();
10
11
  tsdockerCli.addVersion(commitinfo.version);
@@ -218,23 +219,148 @@ export let run = () => {
218
219
  });
219
220
  });
220
221
  tsdockerCli.addCommand('clean').subscribe(async (argvArg) => {
221
- ora.text('cleaning up docker env...');
222
- if (argvArg.all) {
223
- const smartshellInstance = new plugins.smartshell.Smartshell({
224
- executor: 'bash'
225
- });
226
- ora.text('killing any running docker containers...');
227
- await smartshellInstance.exec(`docker kill $(docker ps -q)`);
228
- ora.text('removing stopped containers...');
229
- await smartshellInstance.exec(`docker rm $(docker ps -a -q)`);
230
- ora.text('removing images...');
231
- await smartshellInstance.exec(`docker rmi -f $(docker images -q -f dangling=true)`);
232
- ora.text('removing all other images...');
233
- await smartshellInstance.exec(`docker rmi $(docker images -a -q)`);
234
- ora.text('removing all volumes...');
235
- await smartshellInstance.exec(`docker volume rm $(docker volume ls -f dangling=true -q)`);
236
- }
237
- ora.finishSuccess('docker environment now is clean!');
222
+ try {
223
+ const autoYes = !!argvArg.y;
224
+ const includeAll = !!argvArg.all;
225
+ const smartshellInstance = new plugins.smartshell.Smartshell({ executor: 'bash' });
226
+ const interact = new plugins.smartinteract.SmartInteract();
227
+ // --- Docker context detection ---
228
+ ora.text('detecting docker context...');
229
+ const dockerContext = new DockerContext();
230
+ if (argvArg.context) {
231
+ dockerContext.setContext(argvArg.context);
232
+ }
233
+ await dockerContext.detect();
234
+ ora.stop();
235
+ dockerContext.logContextInfo();
236
+ const listResources = async (command) => {
237
+ const result = await smartshellInstance.execSilent(command);
238
+ if (result.exitCode !== 0 || !result.stdout.trim()) {
239
+ return [];
240
+ }
241
+ return result.stdout.trim().split('\n').filter(Boolean).map((line) => {
242
+ const parts = line.split('\t');
243
+ return {
244
+ id: parts[0],
245
+ display: parts.join(' | '),
246
+ };
247
+ });
248
+ };
249
+ // --- Helper: checkbox selection ---
250
+ const selectResources = async (name, message, resources) => {
251
+ if (autoYes) {
252
+ return resources.map((r) => r.id);
253
+ }
254
+ const answer = await interact.askQuestion({
255
+ name,
256
+ type: 'checkbox',
257
+ message,
258
+ default: [],
259
+ choices: resources.map((r) => ({ name: r.display, value: r.id })),
260
+ });
261
+ return answer.value;
262
+ };
263
+ // --- Helper: confirm action ---
264
+ const confirmAction = async (name, message) => {
265
+ if (autoYes) {
266
+ return true;
267
+ }
268
+ const answer = await interact.askQuestion({
269
+ name,
270
+ type: 'confirm',
271
+ message,
272
+ default: false,
273
+ });
274
+ return answer.value;
275
+ };
276
+ // === RUNNING CONTAINERS ===
277
+ const runningContainers = await listResources(`docker ps --format '{{.ID}}\t{{.Names}}\t{{.Image}}\t{{.Status}}'`);
278
+ if (runningContainers.length > 0) {
279
+ logger.log('info', `Found ${runningContainers.length} running container(s)`);
280
+ const selectedIds = await selectResources('runningContainers', 'Select running containers to kill:', runningContainers);
281
+ if (selectedIds.length > 0) {
282
+ logger.log('info', `Killing ${selectedIds.length} container(s)...`);
283
+ await smartshellInstance.exec(`docker kill ${selectedIds.join(' ')}`);
284
+ }
285
+ }
286
+ else {
287
+ logger.log('info', 'No running containers found');
288
+ }
289
+ // === STOPPED CONTAINERS ===
290
+ const stoppedContainers = await listResources(`docker ps -a --filter status=exited --filter status=created --format '{{.ID}}\t{{.Names}}\t{{.Image}}\t{{.Status}}'`);
291
+ if (stoppedContainers.length > 0) {
292
+ logger.log('info', `Found ${stoppedContainers.length} stopped container(s)`);
293
+ const selectedIds = await selectResources('stoppedContainers', 'Select stopped containers to remove:', stoppedContainers);
294
+ if (selectedIds.length > 0) {
295
+ logger.log('info', `Removing ${selectedIds.length} container(s)...`);
296
+ await smartshellInstance.exec(`docker rm ${selectedIds.join(' ')}`);
297
+ }
298
+ }
299
+ else {
300
+ logger.log('info', 'No stopped containers found');
301
+ }
302
+ // === DANGLING IMAGES ===
303
+ const danglingImages = await listResources(`docker images -f dangling=true --format '{{.ID}}\t{{.Repository}}:{{.Tag}}\t{{.Size}}'`);
304
+ if (danglingImages.length > 0) {
305
+ const confirmed = await confirmAction('removeDanglingImages', `Remove ${danglingImages.length} dangling image(s)?`);
306
+ if (confirmed) {
307
+ logger.log('info', `Removing ${danglingImages.length} dangling image(s)...`);
308
+ const ids = danglingImages.map((r) => r.id).join(' ');
309
+ await smartshellInstance.exec(`docker rmi ${ids}`);
310
+ }
311
+ }
312
+ else {
313
+ logger.log('info', 'No dangling images found');
314
+ }
315
+ // === ALL IMAGES (only with --all) ===
316
+ if (includeAll) {
317
+ const allImages = await listResources(`docker images --format '{{.ID}}\t{{.Repository}}:{{.Tag}}\t{{.Size}}'`);
318
+ if (allImages.length > 0) {
319
+ logger.log('info', `Found ${allImages.length} image(s) total`);
320
+ const selectedIds = await selectResources('allImages', 'Select images to remove:', allImages);
321
+ if (selectedIds.length > 0) {
322
+ logger.log('info', `Removing ${selectedIds.length} image(s)...`);
323
+ await smartshellInstance.exec(`docker rmi -f ${selectedIds.join(' ')}`);
324
+ }
325
+ }
326
+ else {
327
+ logger.log('info', 'No images found');
328
+ }
329
+ }
330
+ // === DANGLING VOLUMES ===
331
+ const danglingVolumes = await listResources(`docker volume ls -f dangling=true --format '{{.Name}}\t{{.Driver}}'`);
332
+ if (danglingVolumes.length > 0) {
333
+ const confirmed = await confirmAction('removeDanglingVolumes', `Remove ${danglingVolumes.length} dangling volume(s)?`);
334
+ if (confirmed) {
335
+ logger.log('info', `Removing ${danglingVolumes.length} dangling volume(s)...`);
336
+ const names = danglingVolumes.map((r) => r.id).join(' ');
337
+ await smartshellInstance.exec(`docker volume rm ${names}`);
338
+ }
339
+ }
340
+ else {
341
+ logger.log('info', 'No dangling volumes found');
342
+ }
343
+ // === ALL VOLUMES (only with --all) ===
344
+ if (includeAll) {
345
+ const allVolumes = await listResources(`docker volume ls --format '{{.Name}}\t{{.Driver}}'`);
346
+ if (allVolumes.length > 0) {
347
+ logger.log('info', `Found ${allVolumes.length} volume(s) total`);
348
+ const selectedIds = await selectResources('allVolumes', 'Select volumes to remove:', allVolumes);
349
+ if (selectedIds.length > 0) {
350
+ logger.log('info', `Removing ${selectedIds.length} volume(s)...`);
351
+ await smartshellInstance.exec(`docker volume rm ${selectedIds.join(' ')}`);
352
+ }
353
+ }
354
+ else {
355
+ logger.log('info', 'No volumes found');
356
+ }
357
+ }
358
+ logger.log('success', 'Docker cleanup completed!');
359
+ }
360
+ catch (err) {
361
+ logger.log('error', `Clean failed: ${err.message}`);
362
+ process.exit(1);
363
+ }
238
364
  });
239
365
  tsdockerCli.addCommand('vscode').subscribe(async (argvArg) => {
240
366
  const smartshellInstance = new plugins.smartshell.Smartshell({
@@ -246,4 +372,4 @@ export let run = () => {
246
372
  });
247
373
  tsdockerCli.startParse();
248
374
  };
249
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tsdocker.cli.js","sourceRoot":"","sources":["../ts/tsdocker.cli.ts"],"names":[],"mappings":"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"}
375
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tsdocker.cli.js","sourceRoot":"","sources":["../ts/tsdocker.cli.ts"],"names":[],"mappings":"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"}
@@ -10,7 +10,8 @@ import * as smartlog from '@push.rocks/smartlog';
10
10
  import * as smartlogDestinationLocal from '@push.rocks/smartlog-destination-local';
11
11
  import * as smartlogSouceOra from '@push.rocks/smartlog-source-ora';
12
12
  import * as smartopen from '@push.rocks/smartopen';
13
+ import * as smartinteract from '@push.rocks/smartinteract';
13
14
  import * as smartshell from '@push.rocks/smartshell';
14
15
  import * as smartstring from '@push.rocks/smartstring';
15
16
  export declare const smartfs: SmartFs;
16
- export { lik, npmextra, path, projectinfo, smartpromise, qenv, smartcli, smartlog, smartlogDestinationLocal, smartlogSouceOra, smartopen, smartshell, smartstring };
17
+ export { lik, npmextra, path, projectinfo, smartpromise, qenv, smartcli, smartinteract, smartlog, smartlogDestinationLocal, smartlogSouceOra, smartopen, smartshell, smartstring };
@@ -11,9 +11,10 @@ import * as smartlog from '@push.rocks/smartlog';
11
11
  import * as smartlogDestinationLocal from '@push.rocks/smartlog-destination-local';
12
12
  import * as smartlogSouceOra from '@push.rocks/smartlog-source-ora';
13
13
  import * as smartopen from '@push.rocks/smartopen';
14
+ import * as smartinteract from '@push.rocks/smartinteract';
14
15
  import * as smartshell from '@push.rocks/smartshell';
15
16
  import * as smartstring from '@push.rocks/smartstring';
16
17
  // Create smartfs instance
17
18
  export const smartfs = new SmartFs(new SmartFsProviderNode());
18
- export { lik, npmextra, path, projectinfo, smartpromise, qenv, smartcli, smartlog, smartlogDestinationLocal, smartlogSouceOra, smartopen, smartshell, smartstring };
19
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHNkb2NrZXIucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3RzZG9ja2VyLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsbUJBQW1CO0FBQ25CLE9BQU8sS0FBSyxHQUFHLE1BQU0saUJBQWlCLENBQUM7QUFDdkMsT0FBTyxLQUFLLFFBQVEsTUFBTSxzQkFBc0IsQ0FBQztBQUNqRCxPQUFPLEtBQUssSUFBSSxNQUFNLE1BQU0sQ0FBQztBQUM3QixPQUFPLEtBQUssV0FBVyxNQUFNLHlCQUF5QixDQUFDO0FBQ3ZELE9BQU8sS0FBSyxZQUFZLE1BQU0sMEJBQTBCLENBQUM7QUFDekQsT0FBTyxLQUFLLElBQUksTUFBTSxrQkFBa0IsQ0FBQztBQUN6QyxPQUFPLEtBQUssUUFBUSxNQUFNLHNCQUFzQixDQUFDO0FBQ2pELE9BQU8sRUFBRSxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNuRSxPQUFPLEtBQUssUUFBUSxNQUFNLHNCQUFzQixDQUFDO0FBQ2pELE9BQU8sS0FBSyx3QkFBd0IsTUFBTSx3Q0FBd0MsQ0FBQztBQUNuRixPQUFPLEtBQUssZ0JBQWdCLE1BQU0saUNBQWlDLENBQUM7QUFDcEUsT0FBTyxLQUFLLFNBQVMsTUFBTSx1QkFBdUIsQ0FBQztBQUNuRCxPQUFPLEtBQUssVUFBVSxNQUFNLHdCQUF3QixDQUFDO0FBQ3JELE9BQU8sS0FBSyxXQUFXLE1BQU0seUJBQXlCLENBQUM7QUFFdkQsMEJBQTBCO0FBQzFCLE1BQU0sQ0FBQyxNQUFNLE9BQU8sR0FBRyxJQUFJLE9BQU8sQ0FBQyxJQUFJLG1CQUFtQixFQUFFLENBQUMsQ0FBQztBQUU5RCxPQUFPLEVBQ0wsR0FBRyxFQUNILFFBQVEsRUFDUixJQUFJLEVBQ0osV0FBVyxFQUNYLFlBQVksRUFDWixJQUFJLEVBQ0osUUFBUSxFQUNSLFFBQVEsRUFDUix3QkFBd0IsRUFDeEIsZ0JBQWdCLEVBQ2hCLFNBQVMsRUFDVCxVQUFVLEVBQ1YsV0FBVyxFQUNaLENBQUMifQ==
19
+ export { lik, npmextra, path, projectinfo, smartpromise, qenv, smartcli, smartinteract, smartlog, smartlogDestinationLocal, smartlogSouceOra, smartopen, smartshell, smartstring };
20
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHNkb2NrZXIucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3RzZG9ja2VyLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsbUJBQW1CO0FBQ25CLE9BQU8sS0FBSyxHQUFHLE1BQU0saUJBQWlCLENBQUM7QUFDdkMsT0FBTyxLQUFLLFFBQVEsTUFBTSxzQkFBc0IsQ0FBQztBQUNqRCxPQUFPLEtBQUssSUFBSSxNQUFNLE1BQU0sQ0FBQztBQUM3QixPQUFPLEtBQUssV0FBVyxNQUFNLHlCQUF5QixDQUFDO0FBQ3ZELE9BQU8sS0FBSyxZQUFZLE1BQU0sMEJBQTBCLENBQUM7QUFDekQsT0FBTyxLQUFLLElBQUksTUFBTSxrQkFBa0IsQ0FBQztBQUN6QyxPQUFPLEtBQUssUUFBUSxNQUFNLHNCQUFzQixDQUFDO0FBQ2pELE9BQU8sRUFBRSxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNuRSxPQUFPLEtBQUssUUFBUSxNQUFNLHNCQUFzQixDQUFDO0FBQ2pELE9BQU8sS0FBSyx3QkFBd0IsTUFBTSx3Q0FBd0MsQ0FBQztBQUNuRixPQUFPLEtBQUssZ0JBQWdCLE1BQU0saUNBQWlDLENBQUM7QUFDcEUsT0FBTyxLQUFLLFNBQVMsTUFBTSx1QkFBdUIsQ0FBQztBQUNuRCxPQUFPLEtBQUssYUFBYSxNQUFNLDJCQUEyQixDQUFDO0FBQzNELE9BQU8sS0FBSyxVQUFVLE1BQU0sd0JBQXdCLENBQUM7QUFDckQsT0FBTyxLQUFLLFdBQVcsTUFBTSx5QkFBeUIsQ0FBQztBQUV2RCwwQkFBMEI7QUFDMUIsTUFBTSxDQUFDLE1BQU0sT0FBTyxHQUFHLElBQUksT0FBTyxDQUFDLElBQUksbUJBQW1CLEVBQUUsQ0FBQyxDQUFDO0FBRTlELE9BQU8sRUFDTCxHQUFHLEVBQ0gsUUFBUSxFQUNSLElBQUksRUFDSixXQUFXLEVBQ1gsWUFBWSxFQUNaLElBQUksRUFDSixRQUFRLEVBQ1IsYUFBYSxFQUNiLFFBQVEsRUFDUix3QkFBd0IsRUFDeEIsZ0JBQWdCLEVBQ2hCLFNBQVMsRUFDVCxVQUFVLEVBQ1YsV0FBVyxFQUNaLENBQUMifQ==
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@git.zone/tsdocker",
3
- "version": "1.14.0",
3
+ "version": "1.15.1",
4
4
  "private": false,
5
5
  "description": "develop npm modules cross platform with docker",
6
6
  "main": "dist_ts/index.js",
@@ -47,6 +47,7 @@
47
47
  "@push.rocks/smartanalytics": "^2.0.15",
48
48
  "@push.rocks/smartcli": "^4.0.20",
49
49
  "@push.rocks/smartfs": "^1.3.1",
50
+ "@push.rocks/smartinteract": "^2.0.16",
50
51
  "@push.rocks/smartlog": "^3.1.10",
51
52
  "@push.rocks/smartlog-destination-local": "^9.0.2",
52
53
  "@push.rocks/smartlog-source-ora": "^1.0.9",
package/readme.hints.md CHANGED
@@ -108,6 +108,18 @@ tsdocker build --parallel --cached # works with both modes
108
108
 
109
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
110
 
111
+ ## OCI Distribution API Push (v1.16+)
112
+
113
+ All builds now go through a persistent local registry (`localhost:5234`) with volume storage at `.nogit/docker-registry/`. Pushes use the `RegistryCopy` class (`ts/classes.registrycopy.ts`) which implements the OCI Distribution API to copy images (including multi-arch manifest lists) from the local registry to remote registries. This replaces the old `docker tag + docker push` approach that only worked for single-platform images.
114
+
115
+ Key classes:
116
+ - `RegistryCopy` — HTTP-based OCI image copy (auth, blob transfer, manifest handling)
117
+ - `Dockerfile.push()` — Now delegates to `RegistryCopy.copyImage()`
118
+ - `Dockerfile.needsLocalRegistry()` — Always returns true
119
+ - `Dockerfile.startLocalRegistry()` — Uses persistent volume mount
120
+
121
+ The `config.push` field is now a no-op (kept for backward compat).
122
+
111
123
  ## Build Status
112
124
 
113
125
  - Build: ✅ Passes
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@git.zone/tsdocker',
6
- version: '1.14.0',
6
+ version: '1.15.1',
7
7
  description: 'develop npm modules cross platform with docker'
8
8
  }
@@ -2,6 +2,7 @@ import * as plugins from './tsdocker.plugins.js';
2
2
  import * as paths from './tsdocker.paths.js';
3
3
  import { logger, formatDuration } from './tsdocker.logging.js';
4
4
  import { DockerRegistry } from './classes.dockerregistry.js';
5
+ import { RegistryCopy } from './classes.registrycopy.js';
5
6
  import type { IDockerfileOptions, ITsDockerConfig, IBuildCommandOptions } from './interfaces/index.js';
6
7
  import type { TsDockerManager } from './classes.tsdockermanager.js';
7
8
  import * as fs from 'fs';
@@ -139,31 +140,32 @@ export class Dockerfile {
139
140
  return sortedDockerfileArray;
140
141
  }
141
142
 
142
- /** Determines if a local registry is needed for buildx dependency resolution. */
143
+ /** Local registry is always needed — it's the canonical store for all built images. */
143
144
  public static needsLocalRegistry(
144
- dockerfiles: Dockerfile[],
145
- options?: { platform?: string },
145
+ _dockerfiles?: Dockerfile[],
146
+ _options?: { platform?: string },
146
147
  ): 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);
148
+ return true;
151
149
  }
152
150
 
153
- /** Starts a temporary registry:2 container on port 5234. */
151
+ /** Starts a persistent registry:2 container on port 5234 with volume storage. */
154
152
  public static async startLocalRegistry(isRootless?: boolean): Promise<void> {
153
+ // Ensure persistent storage directory exists
154
+ const registryDataDir = plugins.path.join(paths.cwd, '.nogit', 'docker-registry');
155
+ fs.mkdirSync(registryDataDir, { recursive: true });
156
+
155
157
  await smartshellInstance.execSilent(
156
158
  `docker rm -f ${LOCAL_REGISTRY_CONTAINER} 2>/dev/null || true`
157
159
  );
158
160
  const result = await smartshellInstance.execSilent(
159
- `docker run -d --name ${LOCAL_REGISTRY_CONTAINER} -p ${LOCAL_REGISTRY_PORT}:5000 registry:2`
161
+ `docker run -d --name ${LOCAL_REGISTRY_CONTAINER} -p ${LOCAL_REGISTRY_PORT}:5000 -v "${registryDataDir}:/var/lib/registry" registry:2`
160
162
  );
161
163
  if (result.exitCode !== 0) {
162
164
  throw new Error(`Failed to start local registry: ${result.stderr || result.stdout}`);
163
165
  }
164
166
  // registry:2 starts near-instantly; brief wait for readiness
165
167
  await new Promise(resolve => setTimeout(resolve, 1000));
166
- logger.log('info', `Started local registry at ${LOCAL_REGISTRY_HOST} (buildx dependency bridge)`);
168
+ logger.log('info', `Started local registry at ${LOCAL_REGISTRY_HOST} (persistent storage at .nogit/docker-registry/)`);
167
169
  if (isRootless) {
168
170
  logger.log('warn', `[rootless] Registry on port ${LOCAL_REGISTRY_PORT} — if buildx cannot reach localhost:${LOCAL_REGISTRY_PORT}, try 127.0.0.1:${LOCAL_REGISTRY_PORT}`);
169
171
  }
@@ -246,11 +248,8 @@ export class Dockerfile {
246
248
  ): Promise<Dockerfile[]> {
247
249
  const total = sortedArrayArg.length;
248
250
  const overallStart = Date.now();
249
- const useRegistry = Dockerfile.needsLocalRegistry(sortedArrayArg, options);
250
251
 
251
- if (useRegistry) {
252
- await Dockerfile.startLocalRegistry(options?.isRootless);
253
- }
252
+ await Dockerfile.startLocalRegistry(options?.isRootless);
254
253
 
255
254
  try {
256
255
  if (options?.parallel) {
@@ -282,8 +281,9 @@ export class Dockerfile {
282
281
 
283
282
  await Dockerfile.runWithConcurrency(tasks, concurrency);
284
283
 
285
- // After the entire level completes, tag + push for dependency resolution
284
+ // After the entire level completes, push all to local registry + tag for deps
286
285
  for (const df of level) {
286
+ // Tag in host daemon for dependency resolution
287
287
  const dependentBaseImages = new Set<string>();
288
288
  for (const other of sortedArrayArg) {
289
289
  if (other.localBaseDockerfile === df && other.baseImage !== df.buildTag) {
@@ -294,7 +294,8 @@ export class Dockerfile {
294
294
  logger.log('info', `Tagging ${df.buildTag} as ${fullTag} for local dependency resolution`);
295
295
  await smartshellInstance.exec(`docker tag ${df.buildTag} ${fullTag}`);
296
296
  }
297
- if (useRegistry && sortedArrayArg.some(other => other.localBaseDockerfile === df)) {
297
+ // Push ALL images to local registry (skip if already pushed via buildx)
298
+ if (!df.localRegistryTag) {
298
299
  await Dockerfile.pushToLocalRegistry(df);
299
300
  }
300
301
  }
@@ -321,16 +322,14 @@ export class Dockerfile {
321
322
  await smartshellInstance.exec(`docker tag ${dockerfileArg.buildTag} ${fullTag}`);
322
323
  }
323
324
 
324
- // Push to local registry for buildx dependency resolution
325
- if (useRegistry && sortedArrayArg.some(other => other.localBaseDockerfile === dockerfileArg)) {
325
+ // Push ALL images to local registry (skip if already pushed via buildx)
326
+ if (!dockerfileArg.localRegistryTag) {
326
327
  await Dockerfile.pushToLocalRegistry(dockerfileArg);
327
328
  }
328
329
  }
329
330
  }
330
331
  } finally {
331
- if (useRegistry) {
332
- await Dockerfile.stopLocalRegistry();
333
- }
332
+ await Dockerfile.stopLocalRegistry();
334
333
  }
335
334
 
336
335
  logger.log('info', `Total build time: ${formatDuration(Date.now() - overallStart)}`);
@@ -594,17 +593,12 @@ export class Dockerfile {
594
593
  buildCommand = `docker buildx build --platform ${platformOverride}${noCacheFlag}${buildContextFlag} --load -t ${this.buildTag} -f ${this.filePath} ${buildArgsString} .`;
595
594
  logger.log('info', `Build: buildx --platform ${platformOverride} --load`);
596
595
  } else if (config.platforms && config.platforms.length > 1) {
597
- // Multi-platform build using buildx
596
+ // Multi-platform build using buildx — always push to local registry
598
597
  const platformString = config.platforms.join(',');
599
- buildCommand = `docker buildx build --platform ${platformString}${noCacheFlag}${buildContextFlag} -t ${this.buildTag} -f ${this.filePath} ${buildArgsString} .`;
600
-
601
- if (config.push) {
602
- buildCommand += ' --push';
603
- logger.log('info', `Build: buildx --platform ${platformString} --push`);
604
- } else {
605
- buildCommand += ' --load';
606
- logger.log('info', `Build: buildx --platform ${platformString} --load`);
607
- }
598
+ const localTag = `${LOCAL_REGISTRY_HOST}/${this.buildTag}`;
599
+ buildCommand = `docker buildx build --platform ${platformString}${noCacheFlag}${buildContextFlag} -t ${localTag} -f ${this.filePath} ${buildArgsString} --push .`;
600
+ this.localRegistryTag = localTag;
601
+ logger.log('info', `Build: buildx --platform ${platformString} --push to local registry`);
608
602
  } else {
609
603
  // Standard build
610
604
  const versionLabel = this.managerRef.projectInfo?.npm?.version || 'unknown';
@@ -645,38 +639,39 @@ export class Dockerfile {
645
639
  }
646
640
 
647
641
  /**
648
- * Pushes the Dockerfile to a registry
642
+ * Pushes the Dockerfile to a registry using OCI Distribution API copy
643
+ * from the local registry to the remote registry.
649
644
  */
650
645
  public async push(dockerRegistryArg: DockerRegistry, versionSuffix?: string): Promise<void> {
651
- this.pushTag = Dockerfile.getDockerTagString(
652
- this.managerRef,
653
- dockerRegistryArg.registryUrl,
654
- this.repo,
655
- this.version,
656
- versionSuffix
657
- );
646
+ const destRepo = this.getDestRepo(dockerRegistryArg.registryUrl);
647
+ const destTag = versionSuffix ? `${this.version}_${versionSuffix}` : this.version;
648
+ const registryCopy = new RegistryCopy();
658
649
 
659
- await smartshellInstance.exec(`docker tag ${this.buildTag} ${this.pushTag}`);
660
- const pushResult = await smartshellInstance.exec(`docker push ${this.pushTag}`);
650
+ this.pushTag = `${dockerRegistryArg.registryUrl}/${destRepo}:${destTag}`;
651
+ logger.log('info', `Pushing ${this.pushTag} via OCI copy from local registry...`);
661
652
 
662
- if (pushResult.exitCode !== 0) {
663
- logger.log('error', `Push failed for ${this.pushTag}`);
664
- throw new Error(`Push failed for ${this.pushTag}`);
665
- }
666
-
667
- // Get image digest
668
- const inspectResult = await smartshellInstance.exec(
669
- `docker inspect --format="{{index .RepoDigests 0}}" ${this.pushTag}`
653
+ await registryCopy.copyImage(
654
+ LOCAL_REGISTRY_HOST,
655
+ this.repo,
656
+ this.version,
657
+ dockerRegistryArg.registryUrl,
658
+ destRepo,
659
+ destTag,
660
+ { username: dockerRegistryArg.username, password: dockerRegistryArg.password },
670
661
  );
671
662
 
672
- if (inspectResult.exitCode === 0 && inspectResult.stdout.includes('@')) {
673
- const imageDigest = inspectResult.stdout.split('@')[1]?.trim();
674
- logger.log('info', `The image ${this.pushTag} has digest ${imageDigest}`);
675
- }
676
-
677
663
  logger.log('ok', `Pushed ${this.pushTag}`);
678
664
  }
679
665
 
666
+ /**
667
+ * Returns the destination repository for a given registry URL,
668
+ * using registryRepoMap if configured, otherwise the default repo.
669
+ */
670
+ private getDestRepo(registryUrl: string): string {
671
+ const config = this.managerRef.config;
672
+ return config.registryRepoMap?.[registryUrl] || this.repo;
673
+ }
674
+
680
675
  /**
681
676
  * Pulls the Dockerfile from a registry
682
677
  */
@@ -696,19 +691,22 @@ export class Dockerfile {
696
691
  }
697
692
 
698
693
  /**
699
- * Tests the Dockerfile by running a test script if it exists
694
+ * Tests the Dockerfile by running a test script if it exists.
695
+ * For multi-platform builds, uses the local registry tag so Docker can auto-pull.
700
696
  */
701
697
  public async test(): Promise<number> {
702
698
  const startTime = Date.now();
703
699
  const testDir = this.managerRef.config.testDir || plugins.path.join(paths.cwd, 'test');
704
700
  const testFile = plugins.path.join(testDir, 'test_' + this.version + '.sh');
701
+ // Use local registry tag for multi-platform images (not in daemon), otherwise buildTag
702
+ const imageRef = this.localRegistryTag || this.buildTag;
705
703
 
706
704
  const testFileExists = fs.existsSync(testFile);
707
705
 
708
706
  if (testFileExists) {
709
707
  // Run tests in container
710
708
  await smartshellInstance.exec(
711
- `docker run --name tsdocker_test_container --entrypoint="bash" ${this.buildTag} -c "mkdir /tsdocker_test"`
709
+ `docker run --name tsdocker_test_container --entrypoint="bash" ${imageRef} -c "mkdir /tsdocker_test"`
712
710
  );
713
711
  await smartshellInstance.exec(`docker cp ${testFile} tsdocker_test_container:/tsdocker_test/test.sh`);
714
712
  await smartshellInstance.exec(`docker commit tsdocker_test_container tsdocker_test_image`);