testcontainers 12.1.0 → 12.2.1

package/build/common/file-lock.js

@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withFileLock = withFileLock;
-const promises_1 = require("fs/promises");
-const path_1 = __importDefault(require("path"));
+const promises_1 = require("node:fs/promises");
+const node_path_1 = __importDefault(require("node:path"));
 const proper_lockfile_1 = __importDefault(require("proper-lockfile"));
 const tmp_1 = __importDefault(require("tmp"));
 const logger_1 = require("./logger");
@@ -29,7 +29,7 @@ async function withFileLock(fileName, fn) {
     }
 }
 async function createEmptyTmpFile(fileName) {
-    const file = path_1.default.resolve(tmp_1.default.tmpdir, fileName);
+    const file = node_path_1.default.resolve(tmp_1.default.tmpdir, fileName);
     await (0, promises_1.writeFile)(file, "");
     return file;
 }

package/build/common/hash.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hash = hash;
-const crypto_1 = __importDefault(require("crypto"));
+const node_crypto_1 = __importDefault(require("node:crypto"));
 function hash(str) {
-    return crypto_1.default.createHash("sha256").update(str).digest("hex");
+    return node_crypto_1.default.createHash("sha256").update(str).digest("hex");
 }

package/build/common/index.d.ts

@@ -1,8 +1,7 @@
 export { withFileLock } from "./file-lock";
 export { hash } from "./hash";
-export { Logger, buildLog, composeLog, containerLog, execLog, log, pullLog } from "./logger";
+export { buildLog, composeLog, containerLog, execLog, Logger, log, pullLog } from "./logger";
 export { IntervalRetry, Retry } from "./retry";
-export { streamToString } from "./streams";
 export * from "./time";
 export * from "./type-guards";
-export { RandomUuid, Uuid, randomUuid } from "./uuid";
+export { RandomUuid, randomUuid, Uuid } from "./uuid";

package/build/common/index.js

@@ -14,23 +14,21 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.randomUuid = exports.RandomUuid = exports.streamToString = exports.IntervalRetry = exports.pullLog = exports.log = exports.execLog = exports.containerLog = exports.composeLog = exports.buildLog = exports.Logger = exports.hash = exports.withFileLock = void 0;
+exports.randomUuid = exports.RandomUuid = exports.IntervalRetry = exports.pullLog = exports.log = exports.Logger = exports.execLog = exports.containerLog = exports.composeLog = exports.buildLog = exports.hash = exports.withFileLock = void 0;
 var file_lock_1 = require("./file-lock");
 Object.defineProperty(exports, "withFileLock", { enumerable: true, get: function () { return file_lock_1.withFileLock; } });
 var hash_1 = require("./hash");
 Object.defineProperty(exports, "hash", { enumerable: true, get: function () { return hash_1.hash; } });
 var logger_1 = require("./logger");
-Object.defineProperty(exports, "Logger", { enumerable: true, get: function () { return logger_1.Logger; } });
 Object.defineProperty(exports, "buildLog", { enumerable: true, get: function () { return logger_1.buildLog; } });
 Object.defineProperty(exports, "composeLog", { enumerable: true, get: function () { return logger_1.composeLog; } });
 Object.defineProperty(exports, "containerLog", { enumerable: true, get: function () { return logger_1.containerLog; } });
 Object.defineProperty(exports, "execLog", { enumerable: true, get: function () { return logger_1.execLog; } });
+Object.defineProperty(exports, "Logger", { enumerable: true, get: function () { return logger_1.Logger; } });
 Object.defineProperty(exports, "log", { enumerable: true, get: function () { return logger_1.log; } });
 Object.defineProperty(exports, "pullLog", { enumerable: true, get: function () { return logger_1.pullLog; } });
 var retry_1 = require("./retry");
 Object.defineProperty(exports, "IntervalRetry", { enumerable: true, get: function () { return retry_1.IntervalRetry; } });
-var streams_1 = require("./streams");
-Object.defineProperty(exports, "streamToString", { enumerable: true, get: function () { return streams_1.streamToString; } });
 __exportStar(require("./time"), exports);
 __exportStar(require("./type-guards"), exports);
 var uuid_1 = require("./uuid");

package/build/common/retry.d.ts

@@ -1,4 +1,4 @@
-import { Clock, Time } from "./clock";
+import { type Clock, type Time } from "./clock";
 export interface Retry<T, U> {
     retryUntil(fn: () => Promise<T>, predicate: (result: T) => boolean | Promise<boolean>, onTimeout: () => U, timeoutMs: number): Promise<T | U>;
 }

package/build/common/uuid.js

@@ -4,11 +4,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.randomUuid = exports.RandomUuid = void 0;
-const crypto_1 = __importDefault(require("crypto"));
+const node_crypto_1 = __importDefault(require("node:crypto"));
 const hash_1 = require("./hash");
 class RandomUuid {
     nextUuid() {
-        return (0, hash_1.hash)(crypto_1.default.randomUUID()).substring(0, 12);
+        return (0, hash_1.hash)(node_crypto_1.default.randomUUID()).substring(0, 12);
     }
 }
 exports.RandomUuid = RandomUuid;

package/build/container-runtime/auth/auths.d.ts

@@ -1,5 +1,5 @@
-import { RegistryAuthLocator } from "./registry-auth-locator";
-import { AuthConfig, ContainerRuntimeConfig } from "./types";
+import type { RegistryAuthLocator } from "./registry-auth-locator";
+import type { AuthConfig, ContainerRuntimeConfig } from "./types";
 export declare class Auths implements RegistryAuthLocator {
     getName(): string;
     getAuthConfig(registry: string, dockerConfig: ContainerRuntimeConfig): Promise<AuthConfig | undefined>;

package/build/container-runtime/auth/cred-helpers.d.ts

@@ -1,5 +1,5 @@
 import { CredentialProvider } from "./credential-provider";
-import { ContainerRuntimeConfig } from "./types";
+import type { ContainerRuntimeConfig } from "./types";
 export declare class CredHelpers extends CredentialProvider {
     getName(): string;
     getCredentialProviderName(registry: string, dockerConfig: ContainerRuntimeConfig): string | undefined;

package/build/container-runtime/auth/credential-provider.d.ts

@@ -1,5 +1,5 @@
-import { RegistryAuthLocator } from "./registry-auth-locator";
-import { AuthConfig, ContainerRuntimeConfig } from "./types";
+import type { RegistryAuthLocator } from "./registry-auth-locator";
+import type { AuthConfig, ContainerRuntimeConfig } from "./types";
 export declare abstract class CredentialProvider implements RegistryAuthLocator {
     abstract getName(): string;
     abstract getCredentialProviderName(registry: string, dockerConfig: ContainerRuntimeConfig): string | undefined;

package/build/container-runtime/auth/credential-provider.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CredentialProvider = void 0;
-const child_process_1 = require("child_process");
+const node_child_process_1 = require("node:child_process");
 const common_1 = require("../../common");
 class CredentialProvider {
     async getAuthConfig(registry, dockerConfig) {
@@ -15,7 +15,7 @@ class CredentialProvider {
     }
     runCredentialProvider(registry, providerName) {
         return new Promise((resolve, reject) => {
-            const sink = (0, child_process_1.spawn)(providerName, ["get"]);
+            const sink = (0, node_child_process_1.spawn)(providerName, ["get"]);
             const chunks = [];
             sink.stdout.on("data", (chunk) => chunks.push(chunk));
             sink.on("error", (err) => {
@@ -35,7 +35,7 @@ class CredentialProvider {
                         : this.parseUsernamePasswordConfig(registry, credentialProviderResponse);
                     return resolve(authConfig);
                 }
-                catch (e) {
+                catch (_e) {
                     common_1.log.error(`Unexpected response from Docker credential provider GET command: "${response}"`);
                     return reject(new Error("Unexpected response from Docker credential provider GET command"));
                 }

package/build/container-runtime/auth/creds-store.d.ts

@@ -1,6 +1,6 @@
 import { CredentialProvider } from "./credential-provider";
-import { ContainerRuntimeConfig } from "./types";
+import type { ContainerRuntimeConfig } from "./types";
 export declare class CredsStore extends CredentialProvider {
     getName(): string;
-    getCredentialProviderName(registry: string, dockerConfig: ContainerRuntimeConfig): string | undefined;
+    getCredentialProviderName(_registry: string, dockerConfig: ContainerRuntimeConfig): string | undefined;
 }

package/build/container-runtime/auth/creds-store.js

@@ -6,7 +6,7 @@ class CredsStore extends credential_provider_1.CredentialProvider {
     getName() {
         return "CredsStore";
     }
-    getCredentialProviderName(registry, dockerConfig) {
+    getCredentialProviderName(_registry, dockerConfig) {
         if (dockerConfig.credsStore !== undefined && dockerConfig.credsStore.length > 0) {
             return dockerConfig.credsStore;
         }

package/build/container-runtime/auth/get-auth-config.d.ts

@@ -1,2 +1,2 @@
-import { AuthConfig } from "./types";
+import type { AuthConfig } from "./types";
 export declare const getAuthConfig: (registry: string) => Promise<AuthConfig | undefined>;

package/build/container-runtime/auth/get-auth-config.js

@@ -4,21 +4,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAuthConfig = void 0;
-const fs_1 = require("fs");
-const promises_1 = require("fs/promises");
-const os_1 = __importDefault(require("os"));
-const path_1 = __importDefault(require("path"));
+const node_fs_1 = require("node:fs");
+const promises_1 = require("node:fs/promises");
+const node_os_1 = __importDefault(require("node:os"));
+const node_path_1 = __importDefault(require("node:path"));
 const common_1 = require("../../common");
 const auths_1 = require("./auths");
 const cred_helpers_1 = require("./cred-helpers");
 const creds_store_1 = require("./creds-store");
-const dockerConfigLocation = process.env.DOCKER_CONFIG || `${os_1.default.homedir()}/.docker`;
-const dockerConfigFile = path_1.default.resolve(dockerConfigLocation, "config.json");
+const dockerConfigLocation = process.env.DOCKER_CONFIG || `${node_os_1.default.homedir()}/.docker`;
+const dockerConfigFile = node_path_1.default.resolve(dockerConfigLocation, "config.json");
 const readDockerConfig = async () => {
     if (process.env.DOCKER_AUTH_CONFIG) {
         return parseDockerConfig(process.env.DOCKER_AUTH_CONFIG);
     }
-    else if ((0, fs_1.existsSync)(dockerConfigFile)) {
+    else if ((0, node_fs_1.existsSync)(dockerConfigFile)) {
         return parseDockerConfig((await (0, promises_1.readFile)(dockerConfigFile)).toString());
     }
     else {

package/build/container-runtime/auth/registry-auth-locator.d.ts

@@ -1,4 +1,4 @@
-import { AuthConfig, ContainerRuntimeConfig } from "./types";
+import type { AuthConfig, ContainerRuntimeConfig } from "./types";
 export interface RegistryAuthLocator {
     getName(): string;
     getAuthConfig(registry: string, dockerConfig: ContainerRuntimeConfig): Promise<AuthConfig | undefined>;

package/build/container-runtime/auth/registry-matches.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registryMatches = void 0;
-const registryMatches = (authConfigRegistry, requestedRegistry) => authConfigRegistry == requestedRegistry || authConfigRegistry.endsWith("://" + requestedRegistry);
+const registryMatches = (authConfigRegistry, requestedRegistry) => authConfigRegistry === requestedRegistry || authConfigRegistry.endsWith(`://${requestedRegistry}`);
 exports.registryMatches = registryMatches;

package/build/container-runtime/clients/client.d.ts

@@ -1,8 +1,8 @@
-import { ComposeClient } from "./compose/compose-client";
-import { ContainerClient } from "./container/container-client";
-import { ImageClient } from "./image/image-client";
-import { NetworkClient } from "./network/network-client";
-import { Info } from "./types";
+import { type ComposeClient } from "./compose/compose-client";
+import type { ContainerClient } from "./container/container-client";
+import type { ImageClient } from "./image/image-client";
+import type { NetworkClient } from "./network/network-client";
+import type { Info } from "./types";
 export declare class ContainerRuntimeClient {
     readonly info: Info;
     readonly compose: ComposeClient;

package/build/container-runtime/clients/compose/compose-client.d.ts

@@ -1,4 +1,4 @@
-import { ComposeDownOptions, ComposeOptions } from "./types";
+import type { ComposeDownOptions, ComposeOptions } from "./types";
 export interface ComposeClient {
     up(options: ComposeOptions, services?: Array<string>): Promise<void>;
     pull(options: ComposeOptions, services?: Array<string>): Promise<void>;

package/build/container-runtime/clients/compose/compose-client.js

@@ -11,7 +11,7 @@ async function getComposeClient(environment) {
     try {
         return new DockerComposeClient(environment);
     }
-    catch (err) {
+    catch (_err) {
         return new MissingComposeClient();
     }
 }
@@ -85,7 +85,6 @@ class DockerComposeClient {
     }
 }
 class MissingComposeClient {
-    constructor() { }
     up() {
         throw new Error("Compose is not installed");
     }
@@ -99,7 +98,6 @@ class MissingComposeClient {
         throw new Error("Compose is not installed");
     }
 }
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 async function handleAndRethrow(err, handle) {
     const error = err instanceof Error ? err : new Error(err.err.trim());
     await handle(error);

package/build/container-runtime/clients/compose/default-compose-options.d.ts

@@ -1,3 +1,3 @@
-import { IDockerComposeOptions } from "docker-compose";
-import { ComposeOptions } from "./types";
+import type { IDockerComposeOptions } from "docker-compose";
+import type { ComposeOptions } from "./types";
 export declare function defaultComposeOptions(environment: NodeJS.ProcessEnv, options: ComposeOptions): Partial<IDockerComposeOptions>;

package/build/container-runtime/clients/compose/default-compose-options.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaultComposeOptions = defaultComposeOptions;
-const os_1 = require("os");
+const node_os_1 = require("node:os");
 const common_1 = require("../../../common");
 function defaultComposeOptions(environment, options) {
     const log = options.logger ?? common_1.composeLog;
@@ -11,9 +11,11 @@ function defaultComposeOptions(environment, options) {
             ? (chunk) => {
                 chunk
                     .toString()
-                    .split(os_1.EOL)
+                    .split(node_os_1.EOL)
                     .filter(common_1.isNotEmptyString)
-                    .forEach((line) => log.trace(line.trim()));
+                    .forEach((line) => {
+                    log.trace(line.trim());
+                });
             }
             : undefined,
         cwd: options.filePath,

package/build/container-runtime/clients/compose/types.d.ts

@@ -1,4 +1,4 @@
-import { Logger } from "../../../common";
+import type { Logger } from "../../../common";
 export type ComposeOptions = {
     filePath: string;
     files: string | string[];
@@ -9,7 +9,7 @@ export type ComposeOptions = {
     logger?: Logger;
     executable?: ComposeExecutableOptions;
 };
-export type ComposeExecutableOptions = {
+type ComposeExecutableOptions = {
     executablePath: string;
     options?: string[] | (string | string[])[];
     standalone?: never;
@@ -22,3 +22,4 @@ export type ComposeDownOptions = {
     timeout: number;
     removeVolumes: boolean;
 };
+export {};

package/build/container-runtime/clients/container/container-client.d.ts

@@ -1,7 +1,8 @@
-import Dockerode, { Container, ContainerCreateOptions, ContainerInfo, ContainerInspectInfo, ContainerLogsOptions, Network } from "dockerode";
-import { Readable } from "stream";
-import { CopyToContainerOptions } from "../../../types";
-import { ContainerCommitOptions, ContainerStatus, ExecOptions, ExecResult } from "./types";
+import type { Readable } from "node:stream";
+import type Dockerode from "dockerode";
+import type { Container, ContainerCreateOptions, ContainerInfo, ContainerInspectInfo, ContainerLogsOptions, Network } from "dockerode";
+import type { CopyToContainerOptions } from "../../../types";
+import type { ContainerCommitOptions, ContainerStatus, ExecOptions, ExecResult } from "./types";
 export interface ContainerClient {
     dockerode: Dockerode;
     getById(id: string): Container;

package/build/container-runtime/clients/container/docker-container-client.d.ts

@@ -1,8 +1,9 @@
-import Dockerode, { Container, ContainerCreateOptions, ContainerInfo, ContainerInspectInfo, ContainerLogsOptions, Network } from "dockerode";
-import { Readable } from "stream";
-import { CopyToContainerOptions } from "../../../types";
-import { ContainerClient } from "./container-client";
-import { ContainerCommitOptions, ContainerStatus, ExecOptions, ExecResult } from "./types";
+import { type Readable } from "node:stream";
+import type Dockerode from "dockerode";
+import type { Container, ContainerCreateOptions, ContainerInfo, ContainerInspectInfo, ContainerLogsOptions, Network } from "dockerode";
+import type { CopyToContainerOptions } from "../../../types";
+import type { ContainerClient } from "./container-client";
+import type { ContainerCommitOptions, ContainerStatus, ExecOptions, ExecResult } from "./types";
 export declare class DockerContainerClient implements ContainerClient {
     readonly dockerode: Dockerode;
     constructor(dockerode: Dockerode);

package/build/container-runtime/clients/container/docker-container-client.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DockerContainerClient = void 0;
-const stream_1 = require("stream");
-const promises_1 = require("stream/promises");
+const node_stream_1 = require("node:stream");
+const promises_1 = require("node:stream/promises");
 const common_1 = require("../../../common");
 class DockerContainerClient {
     dockerode;
@@ -63,11 +63,11 @@ class DockerContainerClient {
     async putArchive(container, stream, path, options) {
         try {
             common_1.log.debug(`Putting archive to container...`, { containerId: container.id });
-            await (0, common_1.streamToString)(stream_1.Readable.from(await container.putArchive(stream, {
+            await container.putArchive(stream, {
                 path,
                 noOverwriteDirNonDir: options?.noOverwriteDirNonDir,
                 copyUIDGID: options?.copyUIDGID,
-            })));
+            });
             common_1.log.debug(`Put archive to container`, { containerId: container.id });
         }
         catch (err) {
@@ -124,7 +124,6 @@ class DockerContainerClient {
             common_1.log.debug(`Stopping container...`, { containerId: container.id });
             await container.stop({ t: (0, common_1.toSeconds)(opts?.timeout ?? 0) });
             common_1.log.debug(`Stopped container`, { containerId: container.id });
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
         }
         catch (err) {
             if (err.statusCode === 304) {
@@ -155,7 +154,7 @@ class DockerContainerClient {
     }
     logs(container, opts) {
         common_1.log.debug(`Fetching container logs...`, { containerId: container.id });
-        const proxyStream = new stream_1.PassThrough();
+        const proxyStream = new node_stream_1.PassThrough();
         proxyStream.setEncoding("utf8");
         container
             .logs({
@@ -169,6 +168,11 @@ class DockerContainerClient {
             const actualLogStream = stream;
             actualLogStream.socket?.unref();
             const demuxedStream = await this.demuxStream(container.id, actualLogStream);
+            if (proxyStream.destroyed) {
+                demuxedStream.destroy();
+                return;
+            }
+            proxyStream.once("close", () => demuxedStream.destroy());
             demuxedStream.pipe(proxyStream);
             demuxedStream.on("error", (err) => proxyStream.emit("error", err));
             demuxedStream.on("end", () => proxyStream.end());
@@ -203,8 +207,8 @@ class DockerContainerClient {
             }
             const exec = await container.exec(execOptions);
             const stream = await exec.start({ stdin: true, Detach: false, Tty: false });
-            const stdoutStream = new stream_1.PassThrough();
-            const stderrStream = new stream_1.PassThrough();
+            const stdoutStream = new node_stream_1.PassThrough();
+            const stderrStream = new node_stream_1.PassThrough();
             this.dockerode.modem.demuxStream(stream, stdoutStream, stderrStream);
             const processStream = (stream, chunks) => {
                 stream.on("data", (chunk) => {
@@ -295,7 +299,7 @@ class DockerContainerClient {
     async demuxStream(containerId, stream) {
         try {
             common_1.log.debug(`Demuxing stream...`, { containerId });
-            const demuxedStream = new stream_1.PassThrough({ autoDestroy: true, encoding: "utf-8" });
+            const demuxedStream = new node_stream_1.PassThrough({ autoDestroy: true, encoding: "utf-8" });
             this.dockerode.modem.demuxStream(stream, demuxedStream, demuxedStream);
             stream.on("end", () => demuxedStream.end());
             demuxedStream.on("close", () => {

package/build/container-runtime/clients/container/types.d.ts

@@ -1,6 +1,4 @@
-export type Environment = {
-    [key in string]: string;
-};
+import type { Environment } from "../../../types";
 export type ExecOptions = {
     workingDir: string;
     user: string;

package/build/container-runtime/clients/image/docker-image-client.d.ts

@@ -1,6 +1,7 @@
-import Dockerode, { ImageBuildOptions, ImageInspectInfo } from "dockerode";
-import { ImageName } from "../../image-name";
-import { ImageClient } from "./image-client";
+import type Dockerode from "dockerode";
+import type { ImageBuildOptions, ImageInspectInfo } from "dockerode";
+import type { ImageName } from "../../image-name";
+import type { ImageClient } from "./image-client";
 export declare class DockerImageClient implements ImageClient {
     protected readonly dockerode: Dockerode;
     protected readonly indexServerAddress: string;

package/build/container-runtime/clients/image/docker-image-client.js

@@ -4,11 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DockerImageClient = void 0;
+const node_fs_1 = require("node:fs");
+const node_path_1 = __importDefault(require("node:path"));
+const node_stream_1 = require("node:stream");
 const dockerignore_1 = __importDefault(require("@balena/dockerignore"));
 const async_lock_1 = __importDefault(require("async-lock"));
 const byline_1 = __importDefault(require("byline"));
-const fs_1 = require("fs");
-const path_1 = __importDefault(require("path"));
 const tar_fs_1 = __importDefault(require("tar-fs"));
 const common_1 = require("../../../common");
 const get_auth_config_1 = require("../../auth/get-auth-config");
@@ -25,7 +26,7 @@ class DockerImageClient {
         try {
             common_1.log.debug(`Building image "${opts.t}" with context "${context}"...`);
             const tarPackOptions = await this.createTarPackOptions(context, opts.dockerfile ?? "Dockerfile");
-            const tarStream = tar_fs_1.default.pack(context, tarPackOptions);
+            const tarStream = node_stream_1.Readable.from(tar_fs_1.default.pack(context, tarPackOptions));
             await new Promise((resolve) => {
                 this.dockerode
                     .buildImage(tarStream, opts)
@@ -48,16 +49,16 @@ class DockerImageClient {
         }
     }
     async createTarPackOptions(context, dockerfileName) {
-        const dockerIgnoreFilePath = path_1.default.join(context, ".dockerignore");
-        if (!(0, fs_1.existsSync)(dockerIgnoreFilePath)) {
+        const dockerIgnoreFilePath = node_path_1.default.join(context, ".dockerignore");
+        if (!(0, node_fs_1.existsSync)(dockerIgnoreFilePath)) {
             return {};
         }
-        const dockerIgnorePatterns = await fs_1.promises.readFile(dockerIgnoreFilePath, { encoding: "utf-8" });
+        const dockerIgnorePatterns = await node_fs_1.promises.readFile(dockerIgnoreFilePath, { encoding: "utf-8" });
         const instance = (0, dockerignore_1.default)({ ignorecase: false });
         instance.add(dockerIgnorePatterns);
         const allEntries = await this.listContextEntries(context);
         const includedEntries = instance.filter(allEntries);
-        const dockerfilePath = this.normalizePathForDockerIgnore(path_1.default.normalize(dockerfileName));
+        const dockerfilePath = this.normalizePathForDockerIgnore(node_path_1.default.normalize(dockerfileName));
         if (!includedEntries.includes(dockerfilePath)) {
             includedEntries.push(dockerfilePath);
         }
@@ -71,10 +72,10 @@ class DockerImageClient {
             if (directory === undefined) {
                 continue;
             }
-            const absoluteDirectory = directory.length > 0 ? path_1.default.join(context, directory) : context;
-            const directoryEntries = await fs_1.promises.readdir(absoluteDirectory, { withFileTypes: true });
+            const absoluteDirectory = directory.length > 0 ? node_path_1.default.join(context, directory) : context;
+            const directoryEntries = await node_fs_1.promises.readdir(absoluteDirectory, { withFileTypes: true });
             for (const directoryEntry of directoryEntries) {
-                const relativeEntry = directory.length > 0 ? path_1.default.join(directory, directoryEntry.name) : directoryEntry.name;
+                const relativeEntry = directory.length > 0 ? node_path_1.default.join(directory, directoryEntry.name) : directoryEntry.name;
                 if (directoryEntry.isDirectory()) {
                     directoriesToVisit.push(relativeEntry);
                 }

package/build/container-runtime/clients/image/image-client.d.ts

@@ -1,5 +1,5 @@
-import { ImageBuildOptions, ImageInspectInfo } from "dockerode";
-import { ImageName } from "../../image-name";
+import type { ImageBuildOptions, ImageInspectInfo } from "dockerode";
+import type { ImageName } from "../../image-name";
 export interface ImageClient {
     build(context: string, opts: ImageBuildOptions): Promise<void>;
     pull(imageName: ImageName, opts?: {

package/build/container-runtime/clients/network/docker-network-client.d.ts

@@ -1,5 +1,6 @@
-import Dockerode, { Network, NetworkCreateOptions } from "dockerode";
-import { NetworkClient } from "./network-client";
+import type Dockerode from "dockerode";
+import type { Network, NetworkCreateOptions } from "dockerode";
+import type { NetworkClient } from "./network-client";
 export declare class DockerNetworkClient implements NetworkClient {
     protected readonly dockerode: Dockerode;
     constructor(dockerode: Dockerode);

package/build/container-runtime/clients/network/network-client.d.ts

@@ -1,4 +1,4 @@
-import { Network, NetworkCreateOptions } from "dockerode";
+import type { Network, NetworkCreateOptions } from "dockerode";
 export interface NetworkClient {
     getById(id: string): Network;
     create(opts: NetworkCreateOptions): Promise<Network>;

package/build/container-runtime/image-name.d.ts

@@ -2,9 +2,10 @@ export declare class ImageName {
     readonly registry: string | undefined;
     readonly image: string;
     readonly tag: string;
+    readonly digest?: string | undefined;
     readonly string: string;
     private static readonly hexRE;
-    constructor(registry: string | undefined, image: string, tag: string);
+    constructor(registry: string | undefined, image: string, tag: string, digest?: string | undefined);
     equals(other: ImageName): boolean;
     static fromString(string: string): ImageName;
     private static getRegistry;

package/build/container-runtime/image-name.js

@@ -6,12 +6,18 @@ class ImageName {
     registry;
     image;
     tag;
+    digest;
     string;
     static hexRE = /^[0-9a-f]{64}$/i;
-    constructor(registry, image, tag) {
+    constructor(registry, image, tag, digest) {
         this.registry = registry;
         this.image = image;
         this.tag = tag;
+        this.digest = digest;
+        if (!this.digest && this.tag.startsWith("sha256:")) {
+            // A digest-only reference (image@sha256:...) keeps the digest as its tag.
+            this.digest = this.tag;
+        }
         if (!this.registry && process.env.TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX) {
             const prefix = process.env.TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX;
             // Parse the registry. If it's undefined - then the whole prefix is a registry.
@@ -30,12 +36,13 @@ class ImageName {
             }
             common_1.log.info(message);
         }
+        const tagAndDigest = this.digest ? `${this.tag}@${this.digest}` : this.tag;
         if (this.registry) {
             if (this.tag.startsWith("sha256:")) {
                 this.string = `${this.registry}/${this.image}@${this.tag}`;
             }
             else {
-                this.string = `${this.registry}/${this.image}:${this.tag}`;
+                this.string = `${this.registry}/${this.image}:${tagAndDigest}`;
             }
         }
         else if (this.tag === "latest" && ImageName.hexRE.test(this.image)) {
@@ -51,30 +58,33 @@ class ImageName {
             this.string = `${this.image}@${this.tag}`;
         }
         else {
-            this.string = `${this.image}:${this.tag}`;
+            this.string = `${this.image}:${tagAndDigest}`;
         }
     }
     equals(other) {
-        return this.registry === other.registry && this.image === other.image && this.tag === other.tag;
+        return (this.registry === other.registry &&
+            this.image === other.image &&
+            this.tag === other.tag &&
+            this.digest === other.digest);
     }
     static fromString(string) {
-        const registry = this.getRegistry(string);
+        const registry = ImageName.getRegistry(string);
         const stringWithoutRegistry = registry ? string.split("/").slice(1).join("/") : string;
-        if (stringWithoutRegistry.includes("@")) {
-            const [image, tag] = stringWithoutRegistry.split("@");
-            return new ImageName(registry, image, tag);
+        const [imageAndTag, digest] = stringWithoutRegistry.split("@");
+        if (imageAndTag.includes(":")) {
+            const [image, tag] = imageAndTag.split(":");
+            return new ImageName(registry, image, tag, digest);
         }
-        else if (stringWithoutRegistry.includes(":")) {
-            const [image, tag] = stringWithoutRegistry.split(":");
-            return new ImageName(registry, image, tag);
+        else if (digest) {
+            return new ImageName(registry, imageAndTag, digest);
         }
         else {
-            return new ImageName(registry, stringWithoutRegistry, "latest");
+            return new ImageName(registry, imageAndTag, "latest");
         }
     }
     static getRegistry(string) {
         const parts = string.split("/");
-        if (parts.length > 1 && this.isRegistry(parts[0])) {
+        if (parts.length > 1 && ImageName.isRegistry(parts[0])) {
             return parts[0];
         }
     }