testcontainers 12.1.0 → 12.2.1

package/build/container-runtime/index.d.ts

@@ -1,6 +1,6 @@
 export { getAuthConfig } from "./auth/get-auth-config";
 export { ContainerRuntimeClient, getContainerRuntimeClient } from "./clients/client";
 export { parseComposeContainerName } from "./clients/compose/parse-compose-container-name";
-export { ComposeDownOptions, ComposeExecutableOptions, ComposeOptions } from "./clients/compose/types";
+export { ComposeDownOptions, ComposeOptions } from "./clients/compose/types";
 export { HostIp } from "./clients/types";
 export { ImageName } from "./image-name";

package/build/container-runtime/strategies/configuration-strategy.d.ts

@@ -1,5 +1,5 @@
-import { ContainerRuntimeClientStrategy } from "./strategy";
-import { ContainerRuntimeClientStrategyResult } from "./types";
+import type { ContainerRuntimeClientStrategy } from "./strategy";
+import type { ContainerRuntimeClientStrategyResult } from "./types";
 export declare class ConfigurationStrategy implements ContainerRuntimeClientStrategy {
     getName(): string;
     getResult(): Promise<ContainerRuntimeClientStrategyResult | undefined>;

package/build/container-runtime/strategies/configuration-strategy.js

@@ -4,9 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfigurationStrategy = void 0;
-const promises_1 = __importDefault(require("fs/promises"));
-const path_1 = __importDefault(require("path"));
-const url_1 = require("url");
+const promises_1 = __importDefault(require("node:fs/promises"));
+const node_path_1 = __importDefault(require("node:path"));
+const node_url_1 = require("node:url");
 const config_1 = require("./utils/config");
 class ConfigurationStrategy {
     getName() {
@@ -18,7 +18,7 @@ class ConfigurationStrategy {
             return undefined;
         }
         const dockerOptions = {};
-        const { pathname, hostname, port } = new url_1.URL(dockerHost);
+        const { pathname, hostname, port } = new node_url_1.URL(dockerHost);
         if (hostname !== "") {
             dockerOptions.host = hostname;
             dockerOptions.port = port;
@@ -27,9 +27,9 @@ class ConfigurationStrategy {
             dockerOptions.socketPath = pathname;
         }
         if (dockerTlsVerify === "1" && dockerCertPath !== undefined) {
-            dockerOptions.ca = await promises_1.default.readFile(path_1.default.resolve(dockerCertPath, "ca.pem"));
-            dockerOptions.cert = await promises_1.default.readFile(path_1.default.resolve(dockerCertPath, "cert.pem"));
-            dockerOptions.key = await promises_1.default.readFile(path_1.default.resolve(dockerCertPath, "key.pem"));
+            dockerOptions.ca = await promises_1.default.readFile(node_path_1.default.resolve(dockerCertPath, "ca.pem"));
+            dockerOptions.cert = await promises_1.default.readFile(node_path_1.default.resolve(dockerCertPath, "cert.pem"));
+            dockerOptions.key = await promises_1.default.readFile(node_path_1.default.resolve(dockerCertPath, "key.pem"));
         }
         return {
             uri: dockerHost,

package/build/container-runtime/strategies/npipe-socket-strategy.d.ts

@@ -1,5 +1,5 @@
-import { ContainerRuntimeClientStrategy } from "./strategy";
-import { ContainerRuntimeClientStrategyResult } from "./types";
+import type { ContainerRuntimeClientStrategy } from "./strategy";
+import type { ContainerRuntimeClientStrategyResult } from "./types";
 export declare class NpipeSocketStrategy implements ContainerRuntimeClientStrategy {
     private readonly platform;
     constructor(platform?: NodeJS.Platform);

package/build/container-runtime/strategies/rootless-unix-socket-strategy.d.ts

@@ -1,5 +1,5 @@
-import { ContainerRuntimeClientStrategy } from "./strategy";
-import { ContainerRuntimeClientStrategyResult } from "./types";
+import type { ContainerRuntimeClientStrategy } from "./strategy";
+import type { ContainerRuntimeClientStrategyResult } from "./types";
 export declare class RootlessUnixSocketStrategy implements ContainerRuntimeClientStrategy {
     private readonly platform;
     private readonly env;

package/build/container-runtime/strategies/rootless-unix-socket-strategy.js

@@ -4,9 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RootlessUnixSocketStrategy = void 0;
-const fs_1 = require("fs");
-const os_1 = __importDefault(require("os"));
-const path_1 = __importDefault(require("path"));
+const node_fs_1 = require("node:fs");
+const node_os_1 = __importDefault(require("node:os"));
+const node_path_1 = __importDefault(require("node:path"));
 const common_1 = require("../../common");
 class RootlessUnixSocketStrategy {
     platform;
@@ -29,7 +29,7 @@ class RootlessUnixSocketStrategy {
             this.getSocketPathFromRunDir(),
         ]
             .filter(common_1.isDefined)
-            .find((candidateSocketPath) => (0, fs_1.existsSync)(candidateSocketPath));
+            .find((candidateSocketPath) => (0, node_fs_1.existsSync)(candidateSocketPath));
         if (!socketPath) {
             return;
         }
@@ -41,22 +41,22 @@ class RootlessUnixSocketStrategy {
         };
     }
     getSocketPathFromEnv() {
-        const xdgRuntimeDir = this.env["XDG_RUNTIME_DIR"];
+        const xdgRuntimeDir = this.env.XDG_RUNTIME_DIR;
         if (xdgRuntimeDir !== undefined) {
-            return path_1.default.join(xdgRuntimeDir, "docker.sock");
+            return node_path_1.default.join(xdgRuntimeDir, "docker.sock");
         }
         else {
             return undefined;
         }
     }
     getSocketPathFromHomeRunDir() {
-        return path_1.default.join(os_1.default.homedir(), ".docker", "run", "docker.sock");
+        return node_path_1.default.join(node_os_1.default.homedir(), ".docker", "run", "docker.sock");
     }
     getSocketPathFromHomeDesktopDir() {
-        return path_1.default.join(os_1.default.homedir(), ".docker", "desktop", "docker.sock");
+        return node_path_1.default.join(node_os_1.default.homedir(), ".docker", "desktop", "docker.sock");
     }
     getSocketPathFromRunDir() {
-        return path_1.default.join("/run", "user", `${os_1.default.userInfo().uid}`, "docker.sock");
+        return node_path_1.default.join("/run", "user", `${node_os_1.default.userInfo().uid}`, "docker.sock");
     }
 }
 exports.RootlessUnixSocketStrategy = RootlessUnixSocketStrategy;

package/build/container-runtime/strategies/strategy.d.ts

@@ -1,4 +1,4 @@
-import { ContainerRuntimeClientStrategyResult } from "./types";
+import type { ContainerRuntimeClientStrategyResult } from "./types";
 export interface ContainerRuntimeClientStrategy {
     getName(): string;
     getResult(): Promise<ContainerRuntimeClientStrategyResult | undefined>;

package/build/container-runtime/strategies/testcontainers-host-strategy.d.ts

@@ -1,5 +1,5 @@
-import { ContainerRuntimeClientStrategy } from "./strategy";
-import { ContainerRuntimeClientStrategyResult } from "./types";
+import type { ContainerRuntimeClientStrategy } from "./strategy";
+import type { ContainerRuntimeClientStrategyResult } from "./types";
 export declare class TestcontainersHostStrategy implements ContainerRuntimeClientStrategy {
     getName(): string;
     getResult(): Promise<ContainerRuntimeClientStrategyResult | undefined>;

package/build/container-runtime/strategies/testcontainers-host-strategy.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TestcontainersHostStrategy = void 0;
-const url_1 = require("url");
+const node_url_1 = require("node:url");
 const config_1 = require("./utils/config");
 class TestcontainersHostStrategy {
     getName() {
@@ -13,7 +13,7 @@ class TestcontainersHostStrategy {
             return;
         }
         const dockerOptions = {};
-        const { hostname, port } = new url_1.URL(tcHost);
+        const { hostname, port } = new node_url_1.URL(tcHost);
         dockerOptions.host = hostname;
         dockerOptions.port = port;
         return {

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

@@ -1,4 +1,4 @@
-import { DockerOptions } from "dockerode";
+import type { DockerOptions } from "dockerode";
 export type ContainerRuntimeClientStrategyResult = {
     uri: string;
     dockerOptions: DockerOptions;

package/build/container-runtime/strategies/unix-socket-strategy.d.ts

@@ -1,5 +1,5 @@
-import { ContainerRuntimeClientStrategy } from "./strategy";
-import { ContainerRuntimeClientStrategyResult } from "./types";
+import type { ContainerRuntimeClientStrategy } from "./strategy";
+import type { ContainerRuntimeClientStrategyResult } from "./types";
 export declare class UnixSocketStrategy implements ContainerRuntimeClientStrategy {
     private readonly platform;
     constructor(platform?: NodeJS.Platform);

package/build/container-runtime/strategies/unix-socket-strategy.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UnixSocketStrategy = void 0;
-const fs_1 = require("fs");
+const node_fs_1 = require("node:fs");
 class UnixSocketStrategy {
     platform;
     constructor(platform = process.platform) {
@@ -11,7 +11,7 @@ class UnixSocketStrategy {
         return "UnixSocketStrategy";
     }
     async getResult() {
-        if ((this.platform !== "linux" && this.platform !== "darwin") || !(0, fs_1.existsSync)("/var/run/docker.sock")) {
+        if ((this.platform !== "linux" && this.platform !== "darwin") || !(0, node_fs_1.existsSync)("/var/run/docker.sock")) {
             return;
         }
         return {

package/build/container-runtime/strategies/utils/config.js

@@ -4,10 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getContainerRuntimeConfig = void 0;
-const fs_1 = require("fs");
-const promises_1 = require("fs/promises");
-const os_1 = 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 = require("node:os");
+const node_path_1 = __importDefault(require("node:path"));
 const properties_reader_1 = __importDefault(require("properties-reader"));
 const common_1 = require("../../../common");
 let containerRuntimeConfig;
@@ -23,9 +23,9 @@ const getContainerRuntimeConfig = async (env = process.env) => {
 };
 exports.getContainerRuntimeConfig = getContainerRuntimeConfig;
 async function loadFromFile() {
-    const file = path_1.default.resolve((0, os_1.homedir)(), ".testcontainers.properties");
+    const file = node_path_1.default.resolve((0, node_os_1.homedir)(), ".testcontainers.properties");
     const dockerClientConfig = {};
-    if ((0, fs_1.existsSync)(file)) {
+    if ((0, node_fs_1.existsSync)(file)) {
         common_1.log.debug(`Loading ".testcontainers.properties" file...`);
         const string = await (0, promises_1.readFile)(file, { encoding: "utf-8" });
         const properties = (0, properties_reader_1.default)({ sourceFile: "" }).read(string);
@@ -51,14 +51,14 @@ async function loadFromFile() {
 }
 function loadFromEnv(env) {
     const dockerClientConfig = {};
-    if (env["DOCKER_HOST"] !== undefined) {
-        dockerClientConfig.dockerHost = env["DOCKER_HOST"];
+    if (env.DOCKER_HOST !== undefined) {
+        dockerClientConfig.dockerHost = env.DOCKER_HOST;
     }
-    if (env["DOCKER_TLS_VERIFY"] !== undefined) {
-        dockerClientConfig.dockerTlsVerify = env["DOCKER_TLS_VERIFY"];
+    if (env.DOCKER_TLS_VERIFY !== undefined) {
+        dockerClientConfig.dockerTlsVerify = env.DOCKER_TLS_VERIFY;
     }
-    if (env["DOCKER_CERT_PATH"] !== undefined) {
-        dockerClientConfig.dockerCertPath = env["DOCKER_CERT_PATH"];
+    if (env.DOCKER_CERT_PATH !== undefined) {
+        dockerClientConfig.dockerCertPath = env.DOCKER_CERT_PATH;
     }
     return dockerClientConfig;
 }

package/build/container-runtime/utils/attach-container.d.ts

@@ -1,3 +1,3 @@
-import Dockerode from "dockerode";
-import { Readable } from "stream";
+import type { Readable } from "node:stream";
+import type Dockerode from "dockerode";
 export declare const attachContainer: (dockerode: Dockerode, container: Dockerode.Container) => Promise<Readable>;

package/build/container-runtime/utils/demux-stream.d.ts

@@ -1,3 +1,3 @@
-import Dockerode from "dockerode";
-import { Readable } from "stream";
+import { type Readable } from "node:stream";
+import type Dockerode from "dockerode";
 export declare function demuxStream(dockerode: Dockerode, stream: Readable): Promise<Readable>;

package/build/container-runtime/utils/demux-stream.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.demuxStream = demuxStream;
-const stream_1 = require("stream");
+const node_stream_1 = require("node:stream");
 const common_1 = require("../../common");
 async function demuxStream(dockerode, stream) {
     try {
-        const demuxedStream = new stream_1.PassThrough({ autoDestroy: true, encoding: "utf-8" });
+        const demuxedStream = new node_stream_1.PassThrough({ autoDestroy: true, encoding: "utf-8" });
         dockerode.modem.demuxStream(stream, demuxedStream, demuxedStream);
         stream.on("end", () => demuxedStream.end());
         demuxedStream.on("close", () => {

package/build/container-runtime/utils/image-exists.d.ts

@@ -1,3 +1,3 @@
-import Dockerode from "dockerode";
-import { ImageName } from "../image-name";
+import type Dockerode from "dockerode";
+import type { ImageName } from "../image-name";
 export declare function imageExists(dockerode: Dockerode, imageName: ImageName): Promise<boolean>;

package/build/container-runtime/utils/lookup-host-ips.d.ts

@@ -1,2 +1,2 @@
-import { HostIp } from "../clients/types";
+import type { HostIp } from "../clients/types";
 export declare const lookupHostIps: (host: string) => Promise<HostIp[]>;

package/build/container-runtime/utils/lookup-host-ips.js

@@ -4,14 +4,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.lookupHostIps = void 0;
-const promises_1 = require("dns/promises");
-const net_1 = __importDefault(require("net"));
+const promises_1 = require("node:dns/promises");
+const node_net_1 = __importDefault(require("node:net"));
 const lookupHostIps = async (host) => {
-    if (net_1.default.isIP(host) === 0) {
+    if (node_net_1.default.isIP(host) === 0) {
         return await (0, promises_1.lookup)(host, { all: true });
     }
     else {
-        return [{ address: host, family: net_1.default.isIP(host) }];
+        return [{ address: host, family: node_net_1.default.isIP(host) }];
     }
 };
 exports.lookupHostIps = lookupHostIps;

package/build/container-runtime/utils/pull-image.d.ts

@@ -1,5 +1,5 @@
-import Dockerode from "dockerode";
-import { ImageName } from "../image-name";
+import type Dockerode from "dockerode";
+import type { ImageName } from "../image-name";
 export type PullImageOptions = {
     imageName: ImageName;
     force: boolean;

package/build/container-runtime/utils/remote-container-runtime-socket-path.d.ts

@@ -1,2 +1,2 @@
-import { ContainerRuntimeClientStrategyResult } from "../strategies/types";
+import type { ContainerRuntimeClientStrategyResult } from "../strategies/types";
 export declare const getRemoteContainerRuntimeSocketPath: (containerRuntimeStrategyResult: ContainerRuntimeClientStrategyResult, containerRuntimeOs: string, platform?: NodeJS.Platform, env?: NodeJS.ProcessEnv) => string;

package/build/container-runtime/utils/remote-container-runtime-socket-path.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRemoteContainerRuntimeSocketPath = void 0;
 const getRemoteContainerRuntimeSocketPath = (containerRuntimeStrategyResult, containerRuntimeOs, platform = process.platform, env = process.env) => {
     if (containerRuntimeStrategyResult.allowUserOverrides) {
-        if (env["TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE"] !== undefined) {
-            return env["TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE"];
+        if (env.TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE !== undefined) {
+            return env.TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE;
         }
     }
     let socketPath;

package/build/container-runtime/utils/resolve-host.d.ts

@@ -1,3 +1,3 @@
-import Dockerode from "dockerode";
-import { ContainerRuntimeClientStrategyResult } from "../strategies/types";
+import type Dockerode from "dockerode";
+import type { ContainerRuntimeClientStrategyResult } from "../strategies/types";
 export declare const resolveHost: (dockerode: Dockerode, strategyResult: ContainerRuntimeClientStrategyResult, indexServerAddress: string, env?: NodeJS.ProcessEnv) => Promise<string>;

package/build/container-runtime/utils/resolve-host.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveHost = void 0;
-const fs_1 = require("fs");
-const url_1 = require("url");
+const node_fs_1 = require("node:fs");
+const node_url_1 = require("node:url");
 const common_1 = require("../../common");
 const run_in_container_1 = require("./run-in-container");
 const resolveHost = async (dockerode, strategyResult, indexServerAddress, env = process.env) => {
@@ -11,7 +11,7 @@ const resolveHost = async (dockerode, strategyResult, indexServerAddress, env =
             return env.TESTCONTAINERS_HOST_OVERRIDE;
         }
     }
-    const { protocol, hostname } = new url_1.URL(strategyResult.uri);
+    const { protocol, hostname } = new node_url_1.URL(strategyResult.uri);
     switch (protocol) {
         case "http:":
         case "https:":
@@ -50,4 +50,4 @@ const findDefaultGateway = async (dockerode, indexServerAddress) => {
         "ip route|awk '/default/ { print $3 }'",
     ]);
 };
-const isInContainer = () => (0, fs_1.existsSync)("/.dockerenv");
+const isInContainer = () => (0, node_fs_1.existsSync)("/.dockerenv");

package/build/container-runtime/utils/run-in-container.d.ts

@@ -1,2 +1,2 @@
-import Dockerode from "dockerode";
+import type Dockerode from "dockerode";
 export declare const runInContainer: (dockerode: Dockerode, indexServerAddress: string, image: string, command: string[]) => Promise<string | undefined>;

package/build/container-runtime/utils/run-in-container.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runInContainer = void 0;
+const consumers_1 = require("node:stream/consumers");
 const common_1 = require("../../common");
 const image_name_1 = require("../image-name");
 const attach_container_1 = require("./attach-container");
@@ -16,7 +17,7 @@ const runInContainer = async (dockerode, indexServerAddress, image, command) =>
         common_1.log.debug(`Starting container...`, { containerId: container.id });
         await (0, start_container_1.startContainer)(container);
         common_1.log.debug(`Waiting for container output...`, { containerId: container.id });
-        const output = await (0, common_1.streamToString)(stream, { trim: true });
+        const output = (await (0, consumers_1.text)(stream)).trim();
         common_1.log.debug(`Removing container...`, { containerId: container.id });
         await container.remove({ force: true, v: true });
         return output.length === 0 ? undefined : output;

package/build/container-runtime/utils/start-container.d.ts

@@ -1,2 +1,2 @@
-import Dockerode from "dockerode";
+import type Dockerode from "dockerode";
 export declare const startContainer: (container: Dockerode.Container) => Promise<void>;

package/build/docker-compose-environment/docker-compose-environment.d.ts

@@ -1,8 +1,8 @@
-import { Uuid } from "../common";
-import { ComposeOptions } from "../container-runtime";
-import { Environment } from "../types";
-import { ImagePullPolicy } from "../utils/pull-policy";
-import { WaitStrategy } from "../wait-strategies/wait-strategy";
+import { type Uuid } from "../common";
+import { type ComposeOptions } from "../container-runtime";
+import type { Environment } from "../types";
+import { type ImagePullPolicy } from "../utils/pull-policy";
+import type { WaitStrategy } from "../wait-strategies/wait-strategy";
 import { StartedDockerComposeEnvironment } from "./started-docker-compose-environment";
 export declare class DockerComposeEnvironment {
     private readonly composeFilePath;

package/build/docker-compose-environment/docker-compose-environment.js

@@ -98,6 +98,10 @@ class DockerComposeEnvironment {
         if (this.build) {
             commandOptions.push("--build");
         }
+        const shouldPull = this.pullPolicy.shouldPull();
+        if (shouldPull === "never") {
+            commandOptions.push("--pull", "never");
+        }
         if (!this.recreate) {
             commandOptions.push("--no-recreate");
         }
@@ -105,8 +109,10 @@ class DockerComposeEnvironment {
         if (this.environmentFile) {
             composeOptions.push("--env-file", this.environmentFile);
         }
-        this.profiles.forEach((profile) => composeOptions.push("--profile", profile));
-        if (this.pullPolicy.shouldPull()) {
+        this.profiles.forEach((profile) => {
+            composeOptions.push("--profile", profile);
+        });
+        if (shouldPull === true) {
             await client.compose.pull(options, services);
         }
         await client.compose.up({
@@ -116,10 +122,7 @@ class DockerComposeEnvironment {
             environment: { ...this.environment },
         }, services);
         const startedContainers = (await client.container.list()).filter((container) => container.Labels["com.docker.compose.project"] === this.projectName);
-        const startedContainerNames = startedContainers.reduce((containerNames, startedContainer) => [
-            ...containerNames,
-            startedContainer.Names.join(", "),
-        ], []);
+        const startedContainerNames = startedContainers.map((startedContainer) => startedContainer.Names.join(", "));
         common_1.log.info(`Started containers "${startedContainerNames.join('", "')}"`);
         const startedContainerNameSet = new Set(startedContainers.map((startedContainer) => (0, container_runtime_1.parseComposeContainerName)(this.projectName, startedContainer.Names[0])));
         this.warnForUnusedWaitStrategies(startedContainerNameSet);
@@ -156,8 +159,15 @@ class DockerComposeEnvironment {
             }
             return new started_generic_container_1.StartedGenericContainer(container, client.info.containerRuntime.host, inspectResult, boundPorts, containerName, waitStrategy, true);
         }))).reduce((map, startedGenericContainer) => {
-            const containerName = startedGenericContainer.getName();
-            return { ...map, [containerName]: startedGenericContainer };
+            // defineProperty rather than assignment: a container named "__proto__" would otherwise
+            // set the prototype instead of creating an own property.
+            Object.defineProperty(map, startedGenericContainer.getName(), {
+                value: startedGenericContainer,
+                writable: true,
+                enumerable: true,
+                configurable: true,
+            });
+            return map;
         }, {});
         common_1.log.info(`DockerCompose environment started`);
         return new started_docker_compose_environment_1.StartedDockerComposeEnvironment(startedGenericContainers, {

package/build/docker-compose-environment/started-docker-compose-environment.d.ts

@@ -1,5 +1,5 @@
-import { ComposeDownOptions, ComposeOptions } from "../container-runtime";
-import { StartedGenericContainer } from "../generic-container/started-generic-container";
+import { type ComposeDownOptions, type ComposeOptions } from "../container-runtime";
+import type { StartedGenericContainer } from "../generic-container/started-generic-container";
 import { DownedDockerComposeEnvironment } from "./downed-docker-compose-environment";
 import { StoppedDockerComposeEnvironment } from "./stopped-docker-compose-environment";
 export declare class StartedDockerComposeEnvironment implements AsyncDisposable {

package/build/docker-compose-environment/stopped-docker-compose-environment.d.ts

@@ -1,4 +1,4 @@
-import { ComposeDownOptions, ComposeOptions } from "../container-runtime";
+import { type ComposeDownOptions, type ComposeOptions } from "../container-runtime";
 import { DownedDockerComposeEnvironment } from "./downed-docker-compose-environment";
 export declare class StoppedDockerComposeEnvironment {
     private readonly options;

package/build/generic-container/abstract-started-container.d.ts

@@ -1,6 +1,6 @@
-import { Readable } from "stream";
-import { RestartOptions, StartedTestContainer, StopOptions, StoppedTestContainer } from "../test-container";
-import { CommitOptions, ContentToCopy, CopyToContainerOptions, DirectoryToCopy, ExecOptions, ExecResult, FileToCopy, Labels } from "../types";
+import type { Readable } from "node:stream";
+import type { RestartOptions, StartedTestContainer, StopOptions, StoppedTestContainer } from "../test-container";
+import type { CommitOptions, ContentToCopy, CopyToContainerOptions, DirectoryToCopy, ExecOptions, ExecResult, FileToCopy, Labels } from "../types";
 export declare class AbstractStartedContainer implements StartedTestContainer {
     protected readonly startedTestContainer: StartedTestContainer;
     constructor(startedTestContainer: StartedTestContainer);

package/build/generic-container/abstract-stopped-container.d.ts

@@ -1,4 +1,4 @@
-import { StoppedTestContainer } from "../test-container";
+import type { StoppedTestContainer } from "../test-container";
 export declare class AbstractStoppedContainer implements StoppedTestContainer {
     protected readonly stoppedTestContainer: StoppedTestContainer;
     constructor(stoppedTestContainer: StoppedTestContainer);

package/build/generic-container/generic-container-builder.d.ts

@@ -1,6 +1,6 @@
-import { Uuid } from "../common";
-import { BuildArgs } from "../types";
-import { ImagePullPolicy } from "../utils/pull-policy";
+import { type Uuid } from "../common";
+import type { BuildArgs } from "../types";
+import { type ImagePullPolicy } from "../utils/pull-policy";
 import { GenericContainer } from "./generic-container";
 export type BuildOptions = {
     deleteOnExit: boolean;

package/build/generic-container/generic-container-builder.js

@@ -4,13 +4,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GenericContainerBuilder = void 0;
-const path_1 = __importDefault(require("path"));
+const node_path_1 = __importDefault(require("node:path"));
 const common_1 = require("../common");
 const container_runtime_1 = require("../container-runtime");
+// biome-ignore lint/suspicious/noImportCycles: Ryuk and sshd run as GenericContainers; only dereferenced at runtime
 const reaper_1 = require("../reaper/reaper");
 const dockerfile_parser_1 = require("../utils/dockerfile-parser");
 const labels_1 = require("../utils/labels");
 const pull_policy_1 = require("../utils/pull-policy");
+// biome-ignore lint/suspicious/noImportCycles: fromDockerfile() and build() construct each other; only dereferenced at runtime
 const generic_container_1 = require("./generic-container");
 class GenericContainerBuilder {
     context;
@@ -52,10 +54,15 @@ class GenericContainerBuilder {
         return this;
     }
     async build(image = `localhost/${this.uuid.nextUuid()}:${this.uuid.nextUuid()}`, options = { deleteOnExit: true }) {
+        const shouldPull = this.pullPolicy.shouldPull();
+        // https://github.com/docker/buildx/issues/1889
+        if (shouldPull === "never") {
+            throw new Error("Never-pull policies are not supported for Dockerfile builds: the Docker build API cannot forbid image pulls");
+        }
         const client = await (0, container_runtime_1.getContainerRuntimeClient)();
         const reaper = await (0, reaper_1.getReaper)(client);
         const imageName = container_runtime_1.ImageName.fromString(image);
-        const dockerfile = path_1.default.resolve(this.context, this.dockerfileName);
+        const dockerfile = node_path_1.default.resolve(this.context, this.dockerfileName);
         const imageNames = await (0, dockerfile_parser_1.getDockerfileImages)(dockerfile, this.buildArgs);
         const registryConfig = await this.getRegistryConfig(client.info.containerRuntime.indexServerAddress, imageNames);
         const labels = (0, labels_1.createLabels)();
@@ -75,7 +82,7 @@ class GenericContainerBuilder {
             platform: this.platform,
             version: this.buildkit ? "2" : "1",
         };
-        if (this.pullPolicy.shouldPull()) {
+        if (shouldPull === true) {
             buildOptions.pull = true;
         }
         await client.image.build(this.context, buildOptions);
@@ -93,9 +100,7 @@ class GenericContainerBuilder {
                 authConfigs.push(authConfig);
             }
         }));
-        return authConfigs
-            .map((authConfig) => ({ [authConfig.registryAddress]: authConfig }))
-            .reduce((prev, next) => ({ ...prev, ...next }), {});
+        return Object.fromEntries(authConfigs.map((authConfig) => [authConfig.registryAddress, authConfig]));
     }
 }
 exports.GenericContainerBuilder = GenericContainerBuilder;

package/build/generic-container/generic-container.d.ts

@@ -1,12 +1,12 @@
-import { ContainerCreateOptions, ContainerInspectInfo, HostConfig } from "dockerode";
-import { Readable } from "stream";
-import { ContainerRuntimeClient, ImageName } from "../container-runtime";
-import { StartedNetwork } from "../network/network";
-import { StartedTestContainer, TestContainer } from "../test-container";
-import { ArchiveToCopy, BindMount, ContentToCopy, CopyToContainerOptions, DirectoryToCopy, Environment, ExtraHost, FileToCopy, HealthCheck, InspectResult, Labels, ResourcesQuota, TmpFs, Ulimits } from "../types";
-import { PortWithOptionalBinding } from "../utils/port";
-import { ImagePullPolicy } from "../utils/pull-policy";
-import { WaitStrategy } from "../wait-strategies/wait-strategy";
+import type { Readable } from "node:stream";
+import type { ContainerCreateOptions, ContainerInspectInfo, HostConfig } from "dockerode";
+import { type ContainerRuntimeClient, ImageName } from "../container-runtime";
+import type { StartedNetwork } from "../network/network";
+import type { StartedTestContainer, TestContainer } from "../test-container";
+import type { ArchiveToCopy, BindMount, ContentToCopy, CopyToContainerOptions, DirectoryToCopy, Environment, ExtraHost, FileToCopy, HealthCheck, InspectResult, Labels, ResourcesQuota, TmpFs, Ulimits } from "../types";
+import { type PortWithOptionalBinding } from "../utils/port";
+import { type ImagePullPolicy } from "../utils/pull-policy";
+import type { WaitStrategy } from "../wait-strategies/wait-strategy";
 import { GenericContainerBuilder } from "./generic-container-builder";
 export declare class GenericContainer implements TestContainer {
     static fromDockerfile(context: string, dockerfileName?: string): GenericContainerBuilder;