@git.zone/tsdocker 1.15.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.
@@ -0,0 +1,359 @@
1
+ import * as fs from 'fs';
2
+ import * as os from 'os';
3
+ import * as path from 'path';
4
+ import { logger } from './tsdocker.logging.js';
5
+ /**
6
+ * OCI Distribution API client for copying images between registries.
7
+ * Supports manifest lists (multi-arch) and single-platform manifests.
8
+ * Uses native fetch (Node 18+).
9
+ */
10
+ export class RegistryCopy {
11
+ tokenCache = {};
12
+ /**
13
+ * Reads Docker credentials from ~/.docker/config.json for a given registry.
14
+ * Supports base64-encoded "auth" field in the config.
15
+ */
16
+ static getDockerConfigCredentials(registryUrl) {
17
+ try {
18
+ const configPath = path.join(os.homedir(), '.docker', 'config.json');
19
+ if (!fs.existsSync(configPath))
20
+ return null;
21
+ const config = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
22
+ const auths = config.auths || {};
23
+ // Try exact match first, then common variations
24
+ const keys = [
25
+ registryUrl,
26
+ `https://${registryUrl}`,
27
+ `http://${registryUrl}`,
28
+ ];
29
+ // Docker Hub special cases
30
+ if (registryUrl === 'docker.io' || registryUrl === 'registry-1.docker.io') {
31
+ keys.push('https://index.docker.io/v1/', 'https://index.docker.io/v2/', 'index.docker.io', 'docker.io', 'registry-1.docker.io');
32
+ }
33
+ for (const key of keys) {
34
+ if (auths[key]?.auth) {
35
+ const decoded = Buffer.from(auths[key].auth, 'base64').toString('utf-8');
36
+ const colonIndex = decoded.indexOf(':');
37
+ if (colonIndex > 0) {
38
+ return {
39
+ username: decoded.substring(0, colonIndex),
40
+ password: decoded.substring(colonIndex + 1),
41
+ };
42
+ }
43
+ }
44
+ }
45
+ return null;
46
+ }
47
+ catch {
48
+ return null;
49
+ }
50
+ }
51
+ /**
52
+ * Returns the API base URL for a registry.
53
+ * Docker Hub uses registry-1.docker.io as API endpoint.
54
+ */
55
+ getRegistryApiBase(registry) {
56
+ if (registry === 'docker.io' || registry === 'index.docker.io') {
57
+ return 'https://registry-1.docker.io';
58
+ }
59
+ // Local registries (localhost) use HTTP
60
+ if (registry.startsWith('localhost') || registry.startsWith('127.0.0.1')) {
61
+ return `http://${registry}`;
62
+ }
63
+ return `https://${registry}`;
64
+ }
65
+ /**
66
+ * Obtains a Bearer token for registry operations.
67
+ * Follows the standard Docker auth flow:
68
+ * GET /v2/ → 401 with Www-Authenticate → request token
69
+ */
70
+ async getToken(registry, repo, actions, credentials) {
71
+ const scope = `repository:${repo}:${actions}`;
72
+ const cached = this.tokenCache[`${registry}/${scope}`];
73
+ if (cached && cached.expiry > Date.now()) {
74
+ return cached.token;
75
+ }
76
+ const apiBase = this.getRegistryApiBase(registry);
77
+ // Local registries typically don't need auth
78
+ if (registry.startsWith('localhost') || registry.startsWith('127.0.0.1')) {
79
+ return null;
80
+ }
81
+ try {
82
+ const checkResp = await fetch(`${apiBase}/v2/`, { method: 'GET' });
83
+ if (checkResp.ok)
84
+ return null; // No auth needed
85
+ const wwwAuth = checkResp.headers.get('www-authenticate') || '';
86
+ const realmMatch = wwwAuth.match(/realm="([^"]+)"/);
87
+ const serviceMatch = wwwAuth.match(/service="([^"]+)"/);
88
+ if (!realmMatch)
89
+ return null;
90
+ const realm = realmMatch[1];
91
+ const service = serviceMatch ? serviceMatch[1] : '';
92
+ const tokenUrl = new URL(realm);
93
+ tokenUrl.searchParams.set('scope', scope);
94
+ if (service)
95
+ tokenUrl.searchParams.set('service', service);
96
+ const headers = {};
97
+ const creds = credentials || RegistryCopy.getDockerConfigCredentials(registry);
98
+ if (creds) {
99
+ headers['Authorization'] = 'Basic ' + Buffer.from(`${creds.username}:${creds.password}`).toString('base64');
100
+ }
101
+ const tokenResp = await fetch(tokenUrl.toString(), { headers });
102
+ if (!tokenResp.ok) {
103
+ const body = await tokenResp.text();
104
+ throw new Error(`Token request failed (${tokenResp.status}): ${body}`);
105
+ }
106
+ const tokenData = await tokenResp.json();
107
+ const token = tokenData.token || tokenData.access_token;
108
+ if (token) {
109
+ // Cache for 5 minutes (conservative)
110
+ this.tokenCache[`${registry}/${scope}`] = {
111
+ token,
112
+ expiry: Date.now() + 5 * 60 * 1000,
113
+ };
114
+ }
115
+ return token;
116
+ }
117
+ catch (err) {
118
+ logger.log('warn', `Auth for ${registry}: ${err.message}`);
119
+ return null;
120
+ }
121
+ }
122
+ /**
123
+ * Makes an authenticated request to a registry.
124
+ */
125
+ async registryFetch(registry, path, options = {}) {
126
+ const apiBase = this.getRegistryApiBase(registry);
127
+ const method = options.method || 'GET';
128
+ const headers = { ...(options.headers || {}) };
129
+ const repo = options.repo || '';
130
+ const actions = options.actions || 'pull';
131
+ const token = await this.getToken(registry, repo, actions, options.credentials);
132
+ if (token) {
133
+ headers['Authorization'] = `Bearer ${token}`;
134
+ }
135
+ const url = `${apiBase}${path}`;
136
+ const fetchOptions = { method, headers };
137
+ if (options.body) {
138
+ fetchOptions.body = options.body;
139
+ fetchOptions.duplex = 'half'; // Required for streaming body in Node
140
+ }
141
+ return fetch(url, fetchOptions);
142
+ }
143
+ /**
144
+ * Gets a manifest from a registry (supports both manifest lists and single manifests).
145
+ */
146
+ async getManifest(registry, repo, reference, credentials) {
147
+ const accept = [
148
+ 'application/vnd.oci.image.index.v1+json',
149
+ 'application/vnd.docker.distribution.manifest.list.v2+json',
150
+ 'application/vnd.oci.image.manifest.v1+json',
151
+ 'application/vnd.docker.distribution.manifest.v2+json',
152
+ ].join(', ');
153
+ const resp = await this.registryFetch(registry, `/v2/${repo}/manifests/${reference}`, {
154
+ headers: { 'Accept': accept },
155
+ repo,
156
+ actions: 'pull',
157
+ credentials,
158
+ });
159
+ if (!resp.ok) {
160
+ const body = await resp.text();
161
+ throw new Error(`Failed to get manifest ${registry}/${repo}:${reference} (${resp.status}): ${body}`);
162
+ }
163
+ const raw = Buffer.from(await resp.arrayBuffer());
164
+ const contentType = resp.headers.get('content-type') || '';
165
+ const digest = resp.headers.get('docker-content-digest') || this.computeDigest(raw);
166
+ const body = JSON.parse(raw.toString('utf-8'));
167
+ return { contentType, body, digest, raw };
168
+ }
169
+ /**
170
+ * Checks if a blob exists in the destination registry.
171
+ */
172
+ async blobExists(registry, repo, digest, credentials) {
173
+ const resp = await this.registryFetch(registry, `/v2/${repo}/blobs/${digest}`, {
174
+ method: 'HEAD',
175
+ repo,
176
+ actions: 'pull,push',
177
+ credentials,
178
+ });
179
+ return resp.ok;
180
+ }
181
+ /**
182
+ * Copies a single blob from source to destination registry.
183
+ * Uses monolithic upload (POST initiate + PUT complete).
184
+ */
185
+ async copyBlob(srcRegistry, srcRepo, destRegistry, destRepo, digest, srcCredentials, destCredentials) {
186
+ // Check if blob already exists at destination
187
+ const exists = await this.blobExists(destRegistry, destRepo, digest, destCredentials);
188
+ if (exists) {
189
+ logger.log('info', ` Blob ${digest.substring(0, 19)}... already exists, skipping`);
190
+ return;
191
+ }
192
+ // Download blob from source
193
+ const getResp = await this.registryFetch(srcRegistry, `/v2/${srcRepo}/blobs/${digest}`, {
194
+ repo: srcRepo,
195
+ actions: 'pull',
196
+ credentials: srcCredentials,
197
+ });
198
+ if (!getResp.ok) {
199
+ throw new Error(`Failed to get blob ${digest} from ${srcRegistry}/${srcRepo}: ${getResp.status}`);
200
+ }
201
+ const blobData = Buffer.from(await getResp.arrayBuffer());
202
+ const blobSize = blobData.length;
203
+ // Initiate upload at destination
204
+ const postResp = await this.registryFetch(destRegistry, `/v2/${destRepo}/blobs/uploads/`, {
205
+ method: 'POST',
206
+ headers: { 'Content-Length': '0' },
207
+ repo: destRepo,
208
+ actions: 'pull,push',
209
+ credentials: destCredentials,
210
+ });
211
+ if (!postResp.ok && postResp.status !== 202) {
212
+ const body = await postResp.text();
213
+ throw new Error(`Failed to initiate upload at ${destRegistry}/${destRepo}: ${postResp.status} ${body}`);
214
+ }
215
+ // Get upload URL from Location header
216
+ let uploadUrl = postResp.headers.get('location') || '';
217
+ if (!uploadUrl) {
218
+ throw new Error(`No upload location returned from ${destRegistry}/${destRepo}`);
219
+ }
220
+ // Make upload URL absolute if relative
221
+ if (uploadUrl.startsWith('/')) {
222
+ const apiBase = this.getRegistryApiBase(destRegistry);
223
+ uploadUrl = `${apiBase}${uploadUrl}`;
224
+ }
225
+ // Complete upload with PUT (monolithic)
226
+ const separator = uploadUrl.includes('?') ? '&' : '?';
227
+ const putUrl = `${uploadUrl}${separator}digest=${encodeURIComponent(digest)}`;
228
+ // For PUT to the upload URL, we need auth
229
+ const token = await this.getToken(destRegistry, destRepo, 'pull,push', destCredentials);
230
+ const putHeaders = {
231
+ 'Content-Type': 'application/octet-stream',
232
+ 'Content-Length': String(blobSize),
233
+ };
234
+ if (token) {
235
+ putHeaders['Authorization'] = `Bearer ${token}`;
236
+ }
237
+ const putResp = await fetch(putUrl, {
238
+ method: 'PUT',
239
+ headers: putHeaders,
240
+ body: blobData,
241
+ });
242
+ if (!putResp.ok) {
243
+ const body = await putResp.text();
244
+ throw new Error(`Failed to upload blob ${digest} to ${destRegistry}/${destRepo}: ${putResp.status} ${body}`);
245
+ }
246
+ const sizeStr = blobSize > 1048576
247
+ ? `${(blobSize / 1048576).toFixed(1)} MB`
248
+ : `${(blobSize / 1024).toFixed(1)} KB`;
249
+ logger.log('info', ` Copied blob ${digest.substring(0, 19)}... (${sizeStr})`);
250
+ }
251
+ /**
252
+ * Pushes a manifest to a registry.
253
+ */
254
+ async putManifest(registry, repo, reference, manifest, contentType, credentials) {
255
+ const resp = await this.registryFetch(registry, `/v2/${repo}/manifests/${reference}`, {
256
+ method: 'PUT',
257
+ headers: {
258
+ 'Content-Type': contentType,
259
+ 'Content-Length': String(manifest.length),
260
+ },
261
+ body: manifest,
262
+ repo,
263
+ actions: 'pull,push',
264
+ credentials,
265
+ });
266
+ if (!resp.ok) {
267
+ const body = await resp.text();
268
+ throw new Error(`Failed to put manifest ${registry}/${repo}:${reference} (${resp.status}): ${body}`);
269
+ }
270
+ const digest = resp.headers.get('docker-content-digest') || this.computeDigest(manifest);
271
+ return digest;
272
+ }
273
+ /**
274
+ * Copies a single-platform manifest and all its blobs from source to destination.
275
+ */
276
+ async copySingleManifest(srcRegistry, srcRepo, destRegistry, destRepo, manifestDigest, srcCredentials, destCredentials) {
277
+ // Get the platform manifest
278
+ const { body: manifest, contentType, raw } = await this.getManifest(srcRegistry, srcRepo, manifestDigest, srcCredentials);
279
+ // Copy config blob
280
+ if (manifest.config?.digest) {
281
+ logger.log('info', ` Copying config blob...`);
282
+ await this.copyBlob(srcRegistry, srcRepo, destRegistry, destRepo, manifest.config.digest, srcCredentials, destCredentials);
283
+ }
284
+ // Copy layer blobs
285
+ const layers = manifest.layers || [];
286
+ for (let i = 0; i < layers.length; i++) {
287
+ const layer = layers[i];
288
+ logger.log('info', ` Copying layer ${i + 1}/${layers.length}...`);
289
+ await this.copyBlob(srcRegistry, srcRepo, destRegistry, destRepo, layer.digest, srcCredentials, destCredentials);
290
+ }
291
+ // Push the platform manifest by digest
292
+ await this.putManifest(destRegistry, destRepo, manifestDigest, raw, contentType, destCredentials);
293
+ }
294
+ /**
295
+ * Copies a complete image (single or multi-arch) from source to destination registry.
296
+ *
297
+ * @param srcRegistry - Source registry host (e.g., "localhost:5234")
298
+ * @param srcRepo - Source repository (e.g., "myapp")
299
+ * @param srcTag - Source tag (e.g., "v1.0.0")
300
+ * @param destRegistry - Destination registry host (e.g., "registry.gitlab.com")
301
+ * @param destRepo - Destination repository (e.g., "org/myapp")
302
+ * @param destTag - Destination tag (e.g., "v1.0.0" or "v1.0.0_arm64")
303
+ * @param credentials - Optional credentials for destination registry
304
+ */
305
+ async copyImage(srcRegistry, srcRepo, srcTag, destRegistry, destRepo, destTag, credentials) {
306
+ logger.log('info', `Copying ${srcRegistry}/${srcRepo}:${srcTag} -> ${destRegistry}/${destRepo}:${destTag}`);
307
+ // Source is always the local registry (no credentials needed)
308
+ const srcCredentials = null;
309
+ const destCredentials = credentials || RegistryCopy.getDockerConfigCredentials(destRegistry);
310
+ // Get the top-level manifest
311
+ const topManifest = await this.getManifest(srcRegistry, srcRepo, srcTag, srcCredentials);
312
+ const { body, contentType, raw } = topManifest;
313
+ const isManifestList = contentType.includes('manifest.list') ||
314
+ contentType.includes('image.index') ||
315
+ body.manifests !== undefined;
316
+ if (isManifestList) {
317
+ // Multi-arch: copy each platform manifest + blobs, then push the manifest list
318
+ const platforms = (body.manifests || []);
319
+ logger.log('info', `Multi-arch manifest with ${platforms.length} platform(s)`);
320
+ for (const platformEntry of platforms) {
321
+ const platDesc = platformEntry.platform
322
+ ? `${platformEntry.platform.os}/${platformEntry.platform.architecture}`
323
+ : platformEntry.digest;
324
+ logger.log('info', `Copying platform: ${platDesc}`);
325
+ await this.copySingleManifest(srcRegistry, srcRepo, destRegistry, destRepo, platformEntry.digest, srcCredentials, destCredentials);
326
+ }
327
+ // Push the manifest list/index with the destination tag
328
+ const digest = await this.putManifest(destRegistry, destRepo, destTag, raw, contentType, destCredentials);
329
+ logger.log('ok', `Pushed manifest list to ${destRegistry}/${destRepo}:${destTag} (${digest.substring(0, 19)}...)`);
330
+ }
331
+ else {
332
+ // Single-platform manifest: copy blobs + push manifest
333
+ logger.log('info', 'Single-platform manifest');
334
+ // Copy config blob
335
+ if (body.config?.digest) {
336
+ logger.log('info', ' Copying config blob...');
337
+ await this.copyBlob(srcRegistry, srcRepo, destRegistry, destRepo, body.config.digest, srcCredentials, destCredentials);
338
+ }
339
+ // Copy layer blobs
340
+ const layers = body.layers || [];
341
+ for (let i = 0; i < layers.length; i++) {
342
+ logger.log('info', ` Copying layer ${i + 1}/${layers.length}...`);
343
+ await this.copyBlob(srcRegistry, srcRepo, destRegistry, destRepo, layers[i].digest, srcCredentials, destCredentials);
344
+ }
345
+ // Push the manifest with the destination tag
346
+ const digest = await this.putManifest(destRegistry, destRepo, destTag, raw, contentType, destCredentials);
347
+ logger.log('ok', `Pushed manifest to ${destRegistry}/${destRepo}:${destTag} (${digest.substring(0, 19)}...)`);
348
+ }
349
+ }
350
+ /**
351
+ * Computes sha256 digest of a buffer.
352
+ */
353
+ computeDigest(data) {
354
+ const crypto = require('crypto');
355
+ const hash = crypto.createHash('sha256').update(data).digest('hex');
356
+ return `sha256:${hash}`;
357
+ }
358
+ }
359
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.registrycopy.js","sourceRoot":"","sources":["../ts/classes.registrycopy.ts"],"names":[],"mappings":"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"}
@@ -47,7 +47,8 @@ export declare class TsDockerManager {
47
47
  */
48
48
  pull(registryUrl: string): Promise<void>;
49
49
  /**
50
- * Runs tests for all Dockerfiles
50
+ * Runs tests for all Dockerfiles.
51
+ * Starts the local registry so multi-platform images can be auto-pulled.
51
52
  */
52
53
  test(): Promise<void>;
53
54
  /**
@@ -164,10 +164,7 @@ export class TsDockerManager {
164
164
  cache.load();
165
165
  const total = toBuild.length;
166
166
  const overallStart = Date.now();
167
- const useRegistry = Dockerfile.needsLocalRegistry(toBuild, options);
168
- if (useRegistry) {
169
- await Dockerfile.startLocalRegistry(this.dockerContext.contextInfo?.isRootless);
170
- }
167
+ await Dockerfile.startLocalRegistry(this.dockerContext.contextInfo?.isRootless);
171
168
  try {
172
169
  if (options?.parallel) {
173
170
  // === PARALLEL CACHED MODE ===
@@ -201,7 +198,7 @@ export class TsDockerManager {
201
198
  };
202
199
  });
203
200
  await Dockerfile.runWithConcurrency(tasks, concurrency);
204
- // After the entire level completes, tag + push for dependency resolution
201
+ // After the entire level completes, push all to local registry + tag for deps
205
202
  for (const df of level) {
206
203
  const dependentBaseImages = new Set();
207
204
  for (const other of toBuild) {
@@ -213,7 +210,8 @@ export class TsDockerManager {
213
210
  logger.log('info', `Tagging ${df.buildTag} as ${fullTag} for local dependency resolution`);
214
211
  await smartshellInstance.exec(`docker tag ${df.buildTag} ${fullTag}`);
215
212
  }
216
- if (useRegistry && toBuild.some(other => other.localBaseDockerfile === df)) {
213
+ // Push ALL images to local registry (skip if already pushed via buildx)
214
+ if (!df.localRegistryTag) {
217
215
  await Dockerfile.pushToLocalRegistry(df);
218
216
  }
219
217
  }
@@ -251,17 +249,15 @@ export class TsDockerManager {
251
249
  logger.log('info', `Tagging ${dockerfileArg.buildTag} as ${fullTag} for local dependency resolution`);
252
250
  await smartshellInstance.exec(`docker tag ${dockerfileArg.buildTag} ${fullTag}`);
253
251
  }
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)) {
252
+ // Push ALL images to local registry (skip if already pushed via buildx)
253
+ if (!dockerfileArg.localRegistryTag) {
256
254
  await Dockerfile.pushToLocalRegistry(dockerfileArg);
257
255
  }
258
256
  }
259
257
  }
260
258
  }
261
259
  finally {
262
- if (useRegistry) {
263
- await Dockerfile.stopLocalRegistry();
264
- }
260
+ await Dockerfile.stopLocalRegistry();
265
261
  }
266
262
  logger.log('info', `Total build time: ${formatDuration(Date.now() - overallStart)}`);
267
263
  cache.save();
@@ -360,12 +356,19 @@ export class TsDockerManager {
360
356
  logger.log('warn', 'No registries available to push to');
361
357
  return;
362
358
  }
363
- // Push each Dockerfile to each registry
364
- for (const dockerfile of this.dockerfiles) {
365
- for (const registry of registriesToPush) {
366
- await dockerfile.push(registry);
359
+ // Start local registry (reads from persistent .nogit/docker-registry/)
360
+ await Dockerfile.startLocalRegistry(this.dockerContext.contextInfo?.isRootless);
361
+ try {
362
+ // Push each Dockerfile to each registry via OCI copy
363
+ for (const dockerfile of this.dockerfiles) {
364
+ for (const registry of registriesToPush) {
365
+ await dockerfile.push(registry);
366
+ }
367
367
  }
368
368
  }
369
+ finally {
370
+ await Dockerfile.stopLocalRegistry();
371
+ }
369
372
  logger.log('success', 'All images pushed successfully');
370
373
  }
371
374
  /**
@@ -385,7 +388,8 @@ export class TsDockerManager {
385
388
  logger.log('success', 'All images pulled successfully');
386
389
  }
387
390
  /**
388
- * Runs tests for all Dockerfiles
391
+ * Runs tests for all Dockerfiles.
392
+ * Starts the local registry so multi-platform images can be auto-pulled.
389
393
  */
390
394
  async test() {
391
395
  if (this.dockerfiles.length === 0) {
@@ -397,7 +401,13 @@ export class TsDockerManager {
397
401
  }
398
402
  logger.log('info', '');
399
403
  logger.log('info', '=== TEST PHASE ===');
400
- await Dockerfile.testDockerfiles(this.dockerfiles);
404
+ await Dockerfile.startLocalRegistry(this.dockerContext.contextInfo?.isRootless);
405
+ try {
406
+ await Dockerfile.testDockerfiles(this.dockerfiles);
407
+ }
408
+ finally {
409
+ await Dockerfile.stopLocalRegistry();
410
+ }
401
411
  logger.log('success', 'All tests completed');
402
412
  }
403
413
  /**
@@ -431,4 +441,4 @@ export class TsDockerManager {
431
441
  return this.dockerfiles;
432
442
  }
433
443
  }
434
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.tsdockermanager.js","sourceRoot":"","sources":["../ts/classes.tsdockermanager.ts"],"names":[],"mappings":"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"}
444
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.tsdockermanager.js","sourceRoot":"","sources":["../ts/classes.tsdockermanager.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@git.zone/tsdocker",
3
- "version": "1.15.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",
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.15.0',
6
+ version: '1.15.1',
7
7
  description: 'develop npm modules cross platform with docker'
8
8
  }