@git.zone/tsdocker 1.15.0 → 1.15.1

package/ts/classes.dockerfile.ts

@@ -2,6 +2,7 @@ import * as plugins from './tsdocker.plugins.js';
 import * as paths from './tsdocker.paths.js';
 import { logger, formatDuration } from './tsdocker.logging.js';
 import { DockerRegistry } from './classes.dockerregistry.js';
+import { RegistryCopy } from './classes.registrycopy.js';
 import type { IDockerfileOptions, ITsDockerConfig, IBuildCommandOptions } from './interfaces/index.js';
 import type { TsDockerManager } from './classes.tsdockermanager.js';
 import * as fs from 'fs';
@@ -139,31 +140,32 @@ export class Dockerfile {
     return sortedDockerfileArray;
   }
 
-  /** Determines if a local registry is needed for buildx dependency resolution. */
+  /** Local registry is always needed — it's the canonical store for all built images. */
   public static needsLocalRegistry(
-    dockerfiles: Dockerfile[],
-    options?: { platform?: string },
+    _dockerfiles?: Dockerfile[],
+    _options?: { platform?: string },
   ): boolean {
-    const hasLocalDeps = dockerfiles.some(df => df.localBaseImageDependent);
-    if (!hasLocalDeps) return false;
-    const config = dockerfiles[0]?.managerRef?.config;
-    return !!options?.platform || !!(config?.platforms && config.platforms.length > 1);
+    return true;
   }
 
-  /** Starts a temporary registry:2 container on port 5234. */
+  /** Starts a persistent registry:2 container on port 5234 with volume storage. */
   public static async startLocalRegistry(isRootless?: boolean): Promise<void> {
+    // Ensure persistent storage directory exists
+    const registryDataDir = plugins.path.join(paths.cwd, '.nogit', 'docker-registry');
+    fs.mkdirSync(registryDataDir, { recursive: true });
+
     await smartshellInstance.execSilent(
       `docker rm -f ${LOCAL_REGISTRY_CONTAINER} 2>/dev/null || true`
     );
     const result = await smartshellInstance.execSilent(
-      `docker run -d --name ${LOCAL_REGISTRY_CONTAINER} -p ${LOCAL_REGISTRY_PORT}:5000 registry:2`
+      `docker run -d --name ${LOCAL_REGISTRY_CONTAINER} -p ${LOCAL_REGISTRY_PORT}:5000 -v "${registryDataDir}:/var/lib/registry" registry:2`
     );
     if (result.exitCode !== 0) {
       throw new Error(`Failed to start local registry: ${result.stderr || result.stdout}`);
     }
     // registry:2 starts near-instantly; brief wait for readiness
     await new Promise(resolve => setTimeout(resolve, 1000));
-    logger.log('info', `Started local registry at ${LOCAL_REGISTRY_HOST} (buildx dependency bridge)`);
+    logger.log('info', `Started local registry at ${LOCAL_REGISTRY_HOST} (persistent storage at .nogit/docker-registry/)`);
     if (isRootless) {
       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}`);
     }
@@ -246,11 +248,8 @@ export class Dockerfile {
   ): Promise<Dockerfile[]> {
     const total = sortedArrayArg.length;
     const overallStart = Date.now();
-    const useRegistry = Dockerfile.needsLocalRegistry(sortedArrayArg, options);
 
-    if (useRegistry) {
-      await Dockerfile.startLocalRegistry(options?.isRootless);
-    }
+    await Dockerfile.startLocalRegistry(options?.isRootless);
 
     try {
       if (options?.parallel) {
@@ -282,8 +281,9 @@ export class Dockerfile {
 
           await Dockerfile.runWithConcurrency(tasks, concurrency);
 
-          // After the entire level completes, tag + push for dependency resolution
+          // After the entire level completes, push all to local registry + tag for deps
           for (const df of level) {
+            // Tag in host daemon for dependency resolution
             const dependentBaseImages = new Set<string>();
             for (const other of sortedArrayArg) {
               if (other.localBaseDockerfile === df && other.baseImage !== df.buildTag) {
@@ -294,7 +294,8 @@ export class Dockerfile {
               logger.log('info', `Tagging ${df.buildTag} as ${fullTag} for local dependency resolution`);
               await smartshellInstance.exec(`docker tag ${df.buildTag} ${fullTag}`);
             }
-            if (useRegistry && sortedArrayArg.some(other => other.localBaseDockerfile === df)) {
+            // Push ALL images to local registry (skip if already pushed via buildx)
+            if (!df.localRegistryTag) {
               await Dockerfile.pushToLocalRegistry(df);
             }
           }
@@ -321,16 +322,14 @@ export class Dockerfile {
             await smartshellInstance.exec(`docker tag ${dockerfileArg.buildTag} ${fullTag}`);
           }
 
-          // Push to local registry for buildx dependency resolution
-          if (useRegistry && sortedArrayArg.some(other => other.localBaseDockerfile === dockerfileArg)) {
+          // Push ALL images to local registry (skip if already pushed via buildx)
+          if (!dockerfileArg.localRegistryTag) {
             await Dockerfile.pushToLocalRegistry(dockerfileArg);
           }
         }
       }
     } finally {
-      if (useRegistry) {
-        await Dockerfile.stopLocalRegistry();
-      }
+      await Dockerfile.stopLocalRegistry();
     }
 
     logger.log('info', `Total build time: ${formatDuration(Date.now() - overallStart)}`);
@@ -594,17 +593,12 @@ export class Dockerfile {
       buildCommand = `docker buildx build --platform ${platformOverride}${noCacheFlag}${buildContextFlag} --load -t ${this.buildTag} -f ${this.filePath} ${buildArgsString} .`;
       logger.log('info', `Build: buildx --platform ${platformOverride} --load`);
     } else if (config.platforms && config.platforms.length > 1) {
-      // Multi-platform build using buildx
+      // Multi-platform build using buildx — always push to local registry
       const platformString = config.platforms.join(',');
-      buildCommand = `docker buildx build --platform ${platformString}${noCacheFlag}${buildContextFlag} -t ${this.buildTag} -f ${this.filePath} ${buildArgsString} .`;
-
-      if (config.push) {
-        buildCommand += ' --push';
-        logger.log('info', `Build: buildx --platform ${platformString} --push`);
-      } else {
-        buildCommand += ' --load';
-        logger.log('info', `Build: buildx --platform ${platformString} --load`);
-      }
+      const localTag = `${LOCAL_REGISTRY_HOST}/${this.buildTag}`;
+      buildCommand = `docker buildx build --platform ${platformString}${noCacheFlag}${buildContextFlag} -t ${localTag} -f ${this.filePath} ${buildArgsString} --push .`;
+      this.localRegistryTag = localTag;
+      logger.log('info', `Build: buildx --platform ${platformString} --push to local registry`);
     } else {
       // Standard build
       const versionLabel = this.managerRef.projectInfo?.npm?.version || 'unknown';
@@ -645,38 +639,39 @@ export class Dockerfile {
   }
 
   /**
-   * Pushes the Dockerfile to a registry
+   * Pushes the Dockerfile to a registry using OCI Distribution API copy
+   * from the local registry to the remote registry.
    */
   public async push(dockerRegistryArg: DockerRegistry, versionSuffix?: string): Promise<void> {
-    this.pushTag = Dockerfile.getDockerTagString(
-      this.managerRef,
-      dockerRegistryArg.registryUrl,
-      this.repo,
-      this.version,
-      versionSuffix
-    );
+    const destRepo = this.getDestRepo(dockerRegistryArg.registryUrl);
+    const destTag = versionSuffix ? `${this.version}_${versionSuffix}` : this.version;
+    const registryCopy = new RegistryCopy();
 
-    await smartshellInstance.exec(`docker tag ${this.buildTag} ${this.pushTag}`);
-    const pushResult = await smartshellInstance.exec(`docker push ${this.pushTag}`);
+    this.pushTag = `${dockerRegistryArg.registryUrl}/${destRepo}:${destTag}`;
+    logger.log('info', `Pushing ${this.pushTag} via OCI copy from local registry...`);
 
-    if (pushResult.exitCode !== 0) {
-      logger.log('error', `Push failed for ${this.pushTag}`);
-      throw new Error(`Push failed for ${this.pushTag}`);
-    }
-
-    // Get image digest
-    const inspectResult = await smartshellInstance.exec(
-      `docker inspect --format="{{index .RepoDigests 0}}" ${this.pushTag}`
+    await registryCopy.copyImage(
+      LOCAL_REGISTRY_HOST,
+      this.repo,
+      this.version,
+      dockerRegistryArg.registryUrl,
+      destRepo,
+      destTag,
+      { username: dockerRegistryArg.username, password: dockerRegistryArg.password },
     );
 
-    if (inspectResult.exitCode === 0 && inspectResult.stdout.includes('@')) {
-      const imageDigest = inspectResult.stdout.split('@')[1]?.trim();
-      logger.log('info', `The image ${this.pushTag} has digest ${imageDigest}`);
-    }
-
     logger.log('ok', `Pushed ${this.pushTag}`);
   }
 
+  /**
+   * Returns the destination repository for a given registry URL,
+   * using registryRepoMap if configured, otherwise the default repo.
+   */
+  private getDestRepo(registryUrl: string): string {
+    const config = this.managerRef.config;
+    return config.registryRepoMap?.[registryUrl] || this.repo;
+  }
+
   /**
    * Pulls the Dockerfile from a registry
    */
@@ -696,19 +691,22 @@ export class Dockerfile {
   }
 
   /**
-   * Tests the Dockerfile by running a test script if it exists
+   * Tests the Dockerfile by running a test script if it exists.
+   * For multi-platform builds, uses the local registry tag so Docker can auto-pull.
    */
   public async test(): Promise<number> {
     const startTime = Date.now();
     const testDir = this.managerRef.config.testDir || plugins.path.join(paths.cwd, 'test');
     const testFile = plugins.path.join(testDir, 'test_' + this.version + '.sh');
+    // Use local registry tag for multi-platform images (not in daemon), otherwise buildTag
+    const imageRef = this.localRegistryTag || this.buildTag;
 
     const testFileExists = fs.existsSync(testFile);
 
     if (testFileExists) {
       // Run tests in container
       await smartshellInstance.exec(
-        `docker run --name tsdocker_test_container --entrypoint="bash" ${this.buildTag} -c "mkdir /tsdocker_test"`
+        `docker run --name tsdocker_test_container --entrypoint="bash" ${imageRef} -c "mkdir /tsdocker_test"`
       );
       await smartshellInstance.exec(`docker cp ${testFile} tsdocker_test_container:/tsdocker_test/test.sh`);
       await smartshellInstance.exec(`docker commit tsdocker_test_container tsdocker_test_image`);