@git.zone/tsdocker 1.3.0 → 1.4.0

package/dist_ts/tsdocker.plugins.d.ts

@@ -1,3 +1,4 @@
+import * as lik from '@push.rocks/lik';
 import * as npmextra from '@push.rocks/npmextra';
 import * as path from 'path';
 import * as projectinfo from '@push.rocks/projectinfo';
@@ -12,4 +13,4 @@ import * as smartopen from '@push.rocks/smartopen';
 import * as smartshell from '@push.rocks/smartshell';
 import * as smartstring from '@push.rocks/smartstring';
 export declare const smartfs: SmartFs;
-export { npmextra, path, projectinfo, smartpromise, qenv, smartcli, smartlog, smartlogDestinationLocal, smartlogSouceOra, smartopen, smartshell, smartstring };
+export { lik, npmextra, path, projectinfo, smartpromise, qenv, smartcli, smartlog, smartlogDestinationLocal, smartlogSouceOra, smartopen, smartshell, smartstring };

package/dist_ts/tsdocker.plugins.js

@@ -1,4 +1,5 @@
 // push.rocks scope
+import * as lik from '@push.rocks/lik';
 import * as npmextra from '@push.rocks/npmextra';
 import * as path from 'path';
 import * as projectinfo from '@push.rocks/projectinfo';
@@ -14,5 +15,5 @@ import * as smartshell from '@push.rocks/smartshell';
 import * as smartstring from '@push.rocks/smartstring';
 // Create smartfs instance
 export const smartfs = new SmartFs(new SmartFsProviderNode());
-export { npmextra, path, projectinfo, smartpromise, qenv, smartcli, smartlog, smartlogDestinationLocal, smartlogSouceOra, smartopen, smartshell, smartstring };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHNkb2NrZXIucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3RzZG9ja2VyLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsbUJBQW1CO0FBQ25CLE9BQU8sS0FBSyxRQUFRLE1BQU0sc0JBQXNCLENBQUM7QUFDakQsT0FBTyxLQUFLLElBQUksTUFBTSxNQUFNLENBQUM7QUFDN0IsT0FBTyxLQUFLLFdBQVcsTUFBTSx5QkFBeUIsQ0FBQztBQUN2RCxPQUFPLEtBQUssWUFBWSxNQUFNLDBCQUEwQixDQUFDO0FBQ3pELE9BQU8sS0FBSyxJQUFJLE1BQU0sa0JBQWtCLENBQUM7QUFDekMsT0FBTyxLQUFLLFFBQVEsTUFBTSxzQkFBc0IsQ0FBQztBQUNqRCxPQUFPLEVBQUUsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDbkUsT0FBTyxLQUFLLFFBQVEsTUFBTSxzQkFBc0IsQ0FBQztBQUNqRCxPQUFPLEtBQUssd0JBQXdCLE1BQU0sd0NBQXdDLENBQUM7QUFDbkYsT0FBTyxLQUFLLGdCQUFnQixNQUFNLGlDQUFpQyxDQUFDO0FBQ3BFLE9BQU8sS0FBSyxTQUFTLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxLQUFLLFVBQVUsTUFBTSx3QkFBd0IsQ0FBQztBQUNyRCxPQUFPLEtBQUssV0FBVyxNQUFNLHlCQUF5QixDQUFDO0FBRXZELDBCQUEwQjtBQUMxQixNQUFNLENBQUMsTUFBTSxPQUFPLEdBQUcsSUFBSSxPQUFPLENBQUMsSUFBSSxtQkFBbUIsRUFBRSxDQUFDLENBQUM7QUFFOUQsT0FBTyxFQUNMLFFBQVEsRUFDUixJQUFJLEVBQ0osV0FBVyxFQUNYLFlBQVksRUFDWixJQUFJLEVBQ0osUUFBUSxFQUNSLFFBQVEsRUFDUix3QkFBd0IsRUFDeEIsZ0JBQWdCLEVBQ2hCLFNBQVMsRUFDVCxVQUFVLEVBQ1YsV0FBVyxFQUNaLENBQUMifQ==
+export { lik, npmextra, path, projectinfo, smartpromise, qenv, smartcli, smartlog, smartlogDestinationLocal, smartlogSouceOra, smartopen, smartshell, smartstring };
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHNkb2NrZXIucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3RzZG9ja2VyLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsbUJBQW1CO0FBQ25CLE9BQU8sS0FBSyxHQUFHLE1BQU0saUJBQWlCLENBQUM7QUFDdkMsT0FBTyxLQUFLLFFBQVEsTUFBTSxzQkFBc0IsQ0FBQztBQUNqRCxPQUFPLEtBQUssSUFBSSxNQUFNLE1BQU0sQ0FBQztBQUM3QixPQUFPLEtBQUssV0FBVyxNQUFNLHlCQUF5QixDQUFDO0FBQ3ZELE9BQU8sS0FBSyxZQUFZLE1BQU0sMEJBQTBCLENBQUM7QUFDekQsT0FBTyxLQUFLLElBQUksTUFBTSxrQkFBa0IsQ0FBQztBQUN6QyxPQUFPLEtBQUssUUFBUSxNQUFNLHNCQUFzQixDQUFDO0FBQ2pELE9BQU8sRUFBRSxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNuRSxPQUFPLEtBQUssUUFBUSxNQUFNLHNCQUFzQixDQUFDO0FBQ2pELE9BQU8sS0FBSyx3QkFBd0IsTUFBTSx3Q0FBd0MsQ0FBQztBQUNuRixPQUFPLEtBQUssZ0JBQWdCLE1BQU0saUNBQWlDLENBQUM7QUFDcEUsT0FBTyxLQUFLLFNBQVMsTUFBTSx1QkFBdUIsQ0FBQztBQUNuRCxPQUFPLEtBQUssVUFBVSxNQUFNLHdCQUF3QixDQUFDO0FBQ3JELE9BQU8sS0FBSyxXQUFXLE1BQU0seUJBQXlCLENBQUM7QUFFdkQsMEJBQTBCO0FBQzFCLE1BQU0sQ0FBQyxNQUFNLE9BQU8sR0FBRyxJQUFJLE9BQU8sQ0FBQyxJQUFJLG1CQUFtQixFQUFFLENBQUMsQ0FBQztBQUU5RCxPQUFPLEVBQ0wsR0FBRyxFQUNILFFBQVEsRUFDUixJQUFJLEVBQ0osV0FBVyxFQUNYLFlBQVksRUFDWixJQUFJLEVBQ0osUUFBUSxFQUNSLFFBQVEsRUFDUix3QkFBd0IsRUFDeEIsZ0JBQWdCLEVBQ2hCLFNBQVMsRUFDVCxVQUFVLEVBQ1YsV0FBVyxFQUNaLENBQUMifQ==

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@git.zone/tsdocker",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "private": false,
   "description": "develop npm modules cross platform with docker",
   "main": "dist_ts/index.js",
@@ -13,7 +13,6 @@
     "build": "(tsbuild)",
     "testIntegration": "(npm run clean && npm run setupCheck && npm run testStandard)",
     "testStandard": "(cd test/ && tsx ../ts/index.ts)",
-    "testSpeed": "(cd test/ && tsx ../ts/index.ts speedtest)",
     "testClean": "(cd test/ && tsx ../ts/index.ts clean --all)",
     "testVscode": "(cd test/ && tsx ../ts/index.ts vscode)",
     "clean": "(rm -rf test/)",
@@ -41,6 +40,7 @@
     "@types/node": "^25.0.9"
   },
   "dependencies": {
+    "@push.rocks/lik": "^6.2.2",
     "@push.rocks/npmextra": "^5.3.3",
     "@push.rocks/projectinfo": "^5.0.2",
     "@push.rocks/qenv": "^6.1.3",

package/readme.hints.md

@@ -2,39 +2,108 @@
 
 ## Module Purpose
 
-tsdocker is a tool for developing npm modules cross-platform using Docker. It allows testing in clean, reproducible Linux environments locally.
+tsdocker is a comprehensive Docker development and building tool. It provides:
+- Testing npm modules in clean Docker environments (legacy feature)
+- Building Dockerfiles with dependency ordering
+- Multi-registry push/pull support
+- Multi-architecture builds (amd64/arm64)
 
-## Recent Upgrades (2025-11-22)
+## New CLI Commands (2026-01-19)
 
-- Updated all @git.zone/_ dependencies to @git.zone/_ scope (latest versions)
-- Updated all @pushrocks/_ dependencies to @push.rocks/_ scope (latest versions)
-- Migrated from smartfile v8 to smartfs v1.1.0
-  - All filesystem operations now use smartfs fluent API
-  - Operations are now async (smartfs is async-only)
-- Updated dev dependencies:
-  - @git.zone/tsbuild: ^3.1.0
-  - @git.zone/tsrun: ^2.0.0
-  - @git.zone/tstest: ^3.1.3
-- Removed @pushrocks/tapbundle (now use @git.zone/tstest/tapbundle)
-- Updated @types/node to ^22.10.2
-- Removed tslint and tslint-config-prettier (no longer needed)
+| Command | Description |
+|---------|-------------|
+| `tsdocker` | Run tests in container (legacy default behavior) |
+| `tsdocker build` | Build all Dockerfiles with dependency ordering |
+| `tsdocker push [registry]` | Push images to configured registries |
+| `tsdocker pull <registry>` | Pull images from registry |
+| `tsdocker test` | Run container tests (test scripts) |
+| `tsdocker login` | Login to configured registries |
+| `tsdocker list` | List discovered Dockerfiles and dependencies |
+| `tsdocker clean --all` | Clean up Docker environment |
+| `tsdocker vscode` | Start VS Code in Docker |
 
-## SmartFS Migration Details
+## Configuration
 
-The following operations were converted:
+Configure in `package.json` under `@git.zone/tsdocker`:
 
-- `smartfile.fs.fileExistsSync()` → Node.js `fs.existsSync()` (for sync needs)
-- `smartfile.fs.ensureDirSync()` → Node.js `fs.mkdirSync(..., { recursive: true })`
-- `smartfile.memory.toFsSync()` → `smartfs.file(path).write(content)` (async)
-- `smartfile.fs.removeSync()` → `smartfs.file(path).delete()` (async)
+```json
+{
+  "@git.zone/tsdocker": {
+    "registries": ["registry.gitlab.com", "docker.io"],
+    "registryRepoMap": {
+      "registry.gitlab.com": "host.today/ht-docker-node"
+    },
+    "buildArgEnvMap": {
+      "NODE_VERSION": "NODE_VERSION"
+    },
+    "platforms": ["linux/amd64", "linux/arm64"],
+    "push": false,
+    "testDir": "./test"
+  }
+}
+```
 
-## Test Status
+### Configuration Options
 
-- Build: ✅ Passes
-- The integration test requires cloning an external test repository (sandbox-npmts)
-- The external test repo uses top-level await which requires ESM module handling
-- This is not a tsdocker issue but rather the test repository's structure
+- `baseImage`: Base Docker image for testing (legacy)
+- `command`: Command to run in container (legacy)
+- `dockerSock`: Mount Docker socket (legacy)
+- `registries`: Array of registry URLs to push to
+- `registryRepoMap`: Map registry URLs to different repo paths
+- `buildArgEnvMap`: Map Docker build ARGs to environment variables
+- `platforms`: Target architectures for buildx
+- `push`: Auto-push after build
+- `testDir`: Directory containing test scripts
+
+## Registry Authentication
+
+Set environment variables for registry login:
+
+```bash
+# Pipe-delimited format (numbered 1-10)
+export DOCKER_REGISTRY_1="registry.gitlab.com|username|password"
+export DOCKER_REGISTRY_2="docker.io|username|password"
+
+# Or individual registry format
+export DOCKER_REGISTRY_URL="registry.gitlab.com"
+export DOCKER_REGISTRY_USER="username"
+export DOCKER_REGISTRY_PASSWORD="password"
+```
+
+## File Structure
+
+```
+ts/
+├── index.ts                      (entry point)
+├── tsdocker.cli.ts               (CLI commands)
+├── tsdocker.config.ts            (configuration)
+├── tsdocker.plugins.ts           (plugin imports)
+├── tsdocker.docker.ts            (legacy test runner)
+├── tsdocker.snippets.ts          (Dockerfile generation)
+├── classes.dockerfile.ts         (Dockerfile management)
+├── classes.dockerregistry.ts     (registry authentication)
+├── classes.registrystorage.ts    (registry storage)
+├── classes.tsdockermanager.ts    (orchestrator)
+└── interfaces/
+    └── index.ts                  (type definitions)
+```
 
 ## Dependencies
 
-All dependencies are now at their latest versions compatible with Node.js without introducing new Node.js-specific dependencies.
+- `@push.rocks/lik`: Object mapping utilities
+- `@push.rocks/smartfs`: Filesystem operations
+- `@push.rocks/smartshell`: Shell command execution
+- `@push.rocks/smartcli`: CLI framework
+- `@push.rocks/projectinfo`: Project metadata
+
+## Build Status
+
+- Build: ✅ Passes
+- Legacy test functionality preserved
+- New Docker build functionality added
+
+## Previous Upgrades (2025-11-22)
+
+- Updated all @git.zone/_ dependencies to @git.zone/_ scope
+- Updated all @pushrocks/_ dependencies to @push.rocks/_ scope
+- Migrated from smartfile v8 to smartfs v1.1.0

package/readme.md

@@ -128,14 +128,6 @@ tsdocker vscode
 
 Launches a containerized VS Code instance accessible via browser at `testing-vscode.git.zone:8443`.
 
-### Speed Test
-
-```bash
-tsdocker speedtest
-```
-
-Runs a network speed test inside a Docker container.
-
 ## Advanced Usage
 
 ### Docker-in-Docker Testing

package/ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@git.zone/tsdocker',
-  version: '1.3.0',
+  version: '1.4.0',
   description: 'develop npm modules cross platform with docker'
 }

package/ts/classes.dockerfile.ts

@@ -0,0 +1,462 @@
+import * as plugins from './tsdocker.plugins.js';
+import * as paths from './tsdocker.paths.js';
+import { logger } from './tsdocker.logging.js';
+import { DockerRegistry } from './classes.dockerregistry.js';
+import type { IDockerfileOptions, ITsDockerConfig } from './interfaces/index.js';
+import type { TsDockerManager } from './classes.tsdockermanager.js';
+
+const smartshellInstance = new plugins.smartshell.Smartshell({
+  executor: 'bash',
+});
+
+/**
+ * Class Dockerfile represents a Dockerfile on disk
+ */
+export class Dockerfile {
+  // STATIC METHODS
+
+  /**
+   * Creates instances of class Dockerfile for all Dockerfiles in cwd
+   */
+  public static async readDockerfiles(managerRef: TsDockerManager): Promise<Dockerfile[]> {
+    const entries = await plugins.smartfs.directory(paths.cwd).filter('Dockerfile*').list();
+    const fileTree = entries
+      .filter(entry => entry.isFile)
+      .map(entry => plugins.path.join(paths.cwd, entry.name));
+
+    const readDockerfilesArray: Dockerfile[] = [];
+    logger.log('info', `found ${fileTree.length} Dockerfiles:`);
+    console.log(fileTree);
+
+    for (const dockerfilePath of fileTree) {
+      const myDockerfile = new Dockerfile(managerRef, {
+        filePath: dockerfilePath,
+        read: true,
+      });
+      readDockerfilesArray.push(myDockerfile);
+    }
+
+    return readDockerfilesArray;
+  }
+
+  /**
+   * Sorts Dockerfiles into a build order based on dependencies (topological sort)
+   */
+  public static async sortDockerfiles(dockerfiles: Dockerfile[]): Promise<Dockerfile[]> {
+    logger.log('info', 'Sorting Dockerfiles based on dependencies...');
+
+    // Map from cleanTag to Dockerfile instance for quick lookup
+    const tagToDockerfile = new Map<string, Dockerfile>();
+    dockerfiles.forEach((dockerfile) => {
+      tagToDockerfile.set(dockerfile.cleanTag, dockerfile);
+    });
+
+    // Build the dependency graph
+    const graph = new Map<Dockerfile, Dockerfile[]>();
+    dockerfiles.forEach((dockerfile) => {
+      const dependencies: Dockerfile[] = [];
+      const baseImage = dockerfile.baseImage;
+
+      // Check if the baseImage is among the local Dockerfiles
+      if (tagToDockerfile.has(baseImage)) {
+        const baseDockerfile = tagToDockerfile.get(baseImage)!;
+        dependencies.push(baseDockerfile);
+        dockerfile.localBaseImageDependent = true;
+        dockerfile.localBaseDockerfile = baseDockerfile;
+      }
+
+      graph.set(dockerfile, dependencies);
+    });
+
+    // Perform topological sort
+    const sortedDockerfiles: Dockerfile[] = [];
+    const visited = new Set<Dockerfile>();
+    const tempMarked = new Set<Dockerfile>();
+
+    const visit = (dockerfile: Dockerfile) => {
+      if (tempMarked.has(dockerfile)) {
+        throw new Error(`Circular dependency detected involving ${dockerfile.cleanTag}`);
+      }
+      if (!visited.has(dockerfile)) {
+        tempMarked.add(dockerfile);
+        const dependencies = graph.get(dockerfile) || [];
+        dependencies.forEach((dep) => visit(dep));
+        tempMarked.delete(dockerfile);
+        visited.add(dockerfile);
+        sortedDockerfiles.push(dockerfile);
+      }
+    };
+
+    try {
+      dockerfiles.forEach((dockerfile) => {
+        if (!visited.has(dockerfile)) {
+          visit(dockerfile);
+        }
+      });
+    } catch (error) {
+      logger.log('error', (error as Error).message);
+      throw error;
+    }
+
+    // Log the sorted order
+    sortedDockerfiles.forEach((dockerfile, index) => {
+      logger.log(
+        'info',
+        `Build order ${index + 1}: ${dockerfile.cleanTag} with base image ${dockerfile.baseImage}`
+      );
+    });
+
+    return sortedDockerfiles;
+  }
+
+  /**
+   * Maps local Dockerfiles dependencies to the corresponding Dockerfile class instances
+   */
+  public static async mapDockerfiles(sortedDockerfileArray: Dockerfile[]): Promise<Dockerfile[]> {
+    sortedDockerfileArray.forEach((dockerfileArg) => {
+      if (dockerfileArg.localBaseImageDependent) {
+        sortedDockerfileArray.forEach((dockfile2: Dockerfile) => {
+          if (dockfile2.cleanTag === dockerfileArg.baseImage) {
+            dockerfileArg.localBaseDockerfile = dockfile2;
+          }
+        });
+      }
+    });
+    return sortedDockerfileArray;
+  }
+
+  /**
+   * Builds the corresponding real docker image for each Dockerfile class instance
+   */
+  public static async buildDockerfiles(sortedArrayArg: Dockerfile[]): Promise<Dockerfile[]> {
+    for (const dockerfileArg of sortedArrayArg) {
+      await dockerfileArg.build();
+    }
+    return sortedArrayArg;
+  }
+
+  /**
+   * Tests all Dockerfiles by calling Dockerfile.test()
+   */
+  public static async testDockerfiles(sortedArrayArg: Dockerfile[]): Promise<Dockerfile[]> {
+    for (const dockerfileArg of sortedArrayArg) {
+      await dockerfileArg.test();
+    }
+    return sortedArrayArg;
+  }
+
+  /**
+   * Returns a version for a docker file
+   * Dockerfile_latest -> latest
+   * Dockerfile_v1.0.0 -> v1.0.0
+   * Dockerfile -> latest
+   */
+  public static dockerFileVersion(
+    dockerfileInstanceArg: Dockerfile,
+    dockerfileNameArg: string
+  ): string {
+    let versionString: string;
+    const versionRegex = /Dockerfile_(.+)$/;
+    const regexResultArray = versionRegex.exec(dockerfileNameArg);
+    if (regexResultArray && regexResultArray.length === 2) {
+      versionString = regexResultArray[1];
+    } else {
+      versionString = 'latest';
+    }
+
+    // Replace ##version## placeholder with actual package version if available
+    if (dockerfileInstanceArg.managerRef?.projectInfo?.npm?.version) {
+      versionString = versionString.replace(
+        '##version##',
+        dockerfileInstanceArg.managerRef.projectInfo.npm.version
+      );
+    }
+
+    return versionString;
+  }
+
+  /**
+   * Extracts the base image from a Dockerfile content
+   * Handles ARG substitution for variable base images
+   */
+  public static dockerBaseImage(dockerfileContentArg: string): string {
+    const lines = dockerfileContentArg.split(/\r?\n/);
+    const args: { [key: string]: string } = {};
+
+    for (const line of lines) {
+      const trimmedLine = line.trim();
+
+      // Skip empty lines and comments
+      if (trimmedLine === '' || trimmedLine.startsWith('#')) {
+        continue;
+      }
+
+      // Match ARG instructions
+      const argMatch = trimmedLine.match(/^ARG\s+([^\s=]+)(?:=(.*))?$/i);
+      if (argMatch) {
+        const argName = argMatch[1];
+        const argValue = argMatch[2] !== undefined ? argMatch[2] : process.env[argName] || '';
+        args[argName] = argValue;
+        continue;
+      }
+
+      // Match FROM instructions
+      const fromMatch = trimmedLine.match(/^FROM\s+(.+?)(?:\s+AS\s+[^\s]+)?$/i);
+      if (fromMatch) {
+        let baseImage = fromMatch[1].trim();
+
+        // Substitute variables in the base image name
+        baseImage = Dockerfile.substituteVariables(baseImage, args);
+
+        return baseImage;
+      }
+    }
+
+    throw new Error('No FROM instruction found in Dockerfile');
+  }
+
+  /**
+   * Substitutes variables in a string, supporting default values like ${VAR:-default}
+   */
+  private static substituteVariables(str: string, vars: { [key: string]: string }): string {
+    return str.replace(/\${([^}:]+)(:-([^}]+))?}/g, (_, varName, __, defaultValue) => {
+      if (vars[varName] !== undefined) {
+        return vars[varName];
+      } else if (defaultValue !== undefined) {
+        return defaultValue;
+      } else {
+        return '';
+      }
+    });
+  }
+
+  /**
+   * Returns the docker tag string for a given registry and repo
+   */
+  public static getDockerTagString(
+    managerRef: TsDockerManager,
+    registryArg: string,
+    repoArg: string,
+    versionArg: string,
+    suffixArg?: string
+  ): string {
+    // Determine whether the repo should be mapped according to the registry
+    const config = managerRef.config;
+    const mappedRepo = config.registryRepoMap?.[registryArg];
+    const repo = mappedRepo || repoArg;
+
+    // Determine whether the version contains a suffix
+    let version = versionArg;
+    if (suffixArg) {
+      version = versionArg + '_' + suffixArg;
+    }
+
+    const tagString = `${registryArg}/${repo}:${version}`;
+    return tagString;
+  }
+
+  /**
+   * Gets build args from environment variable mapping
+   */
+  public static async getDockerBuildArgs(managerRef: TsDockerManager): Promise<string> {
+    logger.log('info', 'checking for env vars to be supplied to the docker build');
+    let buildArgsString: string = '';
+    const config = managerRef.config;
+
+    if (config.buildArgEnvMap) {
+      for (const dockerArgKey of Object.keys(config.buildArgEnvMap)) {
+        const dockerArgOuterEnvVar = config.buildArgEnvMap[dockerArgKey];
+        logger.log(
+          'note',
+          `docker ARG "${dockerArgKey}" maps to outer env var "${dockerArgOuterEnvVar}"`
+        );
+        const targetValue = process.env[dockerArgOuterEnvVar];
+        if (targetValue) {
+          buildArgsString = `${buildArgsString} --build-arg ${dockerArgKey}="${targetValue}"`;
+        }
+      }
+    }
+    return buildArgsString;
+  }
+
+  // INSTANCE PROPERTIES
+  public managerRef: TsDockerManager;
+  public filePath!: string;
+  public repo: string;
+  public version: string;
+  public cleanTag: string;
+  public buildTag: string;
+  public pushTag!: string;
+  public containerName: string;
+  public content!: string;
+  public baseImage: string;
+  public localBaseImageDependent: boolean;
+  public localBaseDockerfile!: Dockerfile;
+
+  constructor(managerRefArg: TsDockerManager, options: IDockerfileOptions) {
+    this.managerRef = managerRefArg;
+    this.filePath = options.filePath!;
+
+    // Build repo name from project info or directory name
+    const projectInfo = this.managerRef.projectInfo;
+    if (projectInfo?.npm?.name) {
+      // Use package name, removing scope if present
+      const packageName = projectInfo.npm.name.replace(/^@[^/]+\//, '');
+      this.repo = packageName;
+    } else {
+      // Fallback to directory name
+      this.repo = plugins.path.basename(paths.cwd);
+    }
+
+    this.version = Dockerfile.dockerFileVersion(this, plugins.path.parse(this.filePath).base);
+    this.cleanTag = this.repo + ':' + this.version;
+    this.buildTag = this.cleanTag;
+    this.containerName = 'dockerfile-' + this.version;
+
+    if (options.filePath && options.read) {
+      const fs = require('fs');
+      this.content = fs.readFileSync(plugins.path.resolve(options.filePath), 'utf-8');
+    } else if (options.fileContents) {
+      this.content = options.fileContents;
+    }
+
+    this.baseImage = Dockerfile.dockerBaseImage(this.content);
+    this.localBaseImageDependent = false;
+  }
+
+  /**
+   * Builds the Dockerfile
+   */
+  public async build(): Promise<void> {
+    logger.log('info', 'now building Dockerfile for ' + this.cleanTag);
+    const buildArgsString = await Dockerfile.getDockerBuildArgs(this.managerRef);
+    const config = this.managerRef.config;
+
+    let buildCommand: string;
+
+    // Check if multi-platform build is needed
+    if (config.platforms && config.platforms.length > 1) {
+      // Multi-platform build using buildx
+      const platformString = config.platforms.join(',');
+      buildCommand = `docker buildx build --platform ${platformString} -t ${this.buildTag} -f ${this.filePath} ${buildArgsString} .`;
+
+      if (config.push) {
+        buildCommand += ' --push';
+      } else {
+        buildCommand += ' --load';
+      }
+    } else {
+      // Standard build
+      const versionLabel = this.managerRef.projectInfo?.npm?.version || 'unknown';
+      buildCommand = `docker build --label="version=${versionLabel}" -t ${this.buildTag} -f ${this.filePath} ${buildArgsString} .`;
+    }
+
+    const result = await smartshellInstance.exec(buildCommand);
+    if (result.exitCode !== 0) {
+      logger.log('error', `Build failed for ${this.cleanTag}`);
+      console.log(result.stdout);
+      throw new Error(`Build failed for ${this.cleanTag}`);
+    }
+
+    logger.log('ok', `Built ${this.cleanTag}`);
+  }
+
+  /**
+   * Pushes the Dockerfile to a registry
+   */
+  public async push(dockerRegistryArg: DockerRegistry, versionSuffix?: string): Promise<void> {
+    this.pushTag = Dockerfile.getDockerTagString(
+      this.managerRef,
+      dockerRegistryArg.registryUrl,
+      this.repo,
+      this.version,
+      versionSuffix
+    );
+
+    await smartshellInstance.exec(`docker tag ${this.buildTag} ${this.pushTag}`);
+    const pushResult = await smartshellInstance.exec(`docker push ${this.pushTag}`);
+
+    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}`
+    );
+
+    if (inspectResult.exitCode === 0 && inspectResult.stdout.includes('@')) {
+      const imageDigest = inspectResult.stdout.split('@')[1]?.trim();
+      console.log(`The image ${this.pushTag} has digest ${imageDigest}`);
+    }
+
+    logger.log('ok', `Pushed ${this.pushTag}`);
+  }
+
+  /**
+   * Pulls the Dockerfile from a registry
+   */
+  public async pull(registryArg: DockerRegistry, versionSuffixArg?: string): Promise<void> {
+    const pullTag = Dockerfile.getDockerTagString(
+      this.managerRef,
+      registryArg.registryUrl,
+      this.repo,
+      this.version,
+      versionSuffixArg
+    );
+
+    await smartshellInstance.exec(`docker pull ${pullTag}`);
+    await smartshellInstance.exec(`docker tag ${pullTag} ${this.buildTag}`);
+
+    logger.log('ok', `Pulled and tagged ${pullTag} as ${this.buildTag}`);
+  }
+
+  /**
+   * Tests the Dockerfile by running a test script if it exists
+   */
+  public async test(): Promise<void> {
+    const testDir = this.managerRef.config.testDir || plugins.path.join(paths.cwd, 'test');
+    const testFile = plugins.path.join(testDir, 'test_' + this.version + '.sh');
+
+    const fs = require('fs');
+    const testFileExists = fs.existsSync(testFile);
+
+    if (testFileExists) {
+      logger.log('info', `Running tests for ${this.cleanTag}`);
+
+      // Run tests in container
+      await smartshellInstance.exec(
+        `docker run --name tsdocker_test_container --entrypoint="bash" ${this.buildTag} -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`);
+
+      const testResult = await smartshellInstance.exec(
+        `docker run --entrypoint="bash" tsdocker_test_image -x /tsdocker_test/test.sh`
+      );
+
+      // Cleanup
+      await smartshellInstance.exec(`docker rm tsdocker_test_container`);
+      await smartshellInstance.exec(`docker rmi --force tsdocker_test_image`);
+
+      if (testResult.exitCode !== 0) {
+        throw new Error(`Tests failed for ${this.cleanTag}`);
+      }
+
+      logger.log('ok', `Tests passed for ${this.cleanTag}`);
+    } else {
+      logger.log('warn', `Skipping tests for ${this.cleanTag} because no test file was found at ${testFile}`);
+    }
+  }
+
+  /**
+   * Gets the ID of a built Docker image
+   */
+  public async getId(): Promise<string> {
+    const result = await smartshellInstance.exec(
+      'docker inspect --type=image --format="{{.Id}}" ' + this.buildTag
+    );
+    return result.stdout.trim();
+  }
+}