testcontainers 12.1.0 → 12.2.0

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

@@ -169,6 +169,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());

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,25 +58,28 @@ 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 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) {

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");
         }
@@ -106,7 +110,7 @@ class DockerComposeEnvironment {
             composeOptions.push("--env-file", this.environmentFile);
         }
         this.profiles.forEach((profile) => composeOptions.push("--profile", profile));
-        if (this.pullPolicy.shouldPull()) {
+        if (shouldPull === true) {
             await client.compose.pull(options, services);
         }
         await client.compose.up({

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

@@ -52,6 +52,11 @@ 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);
@@ -75,7 +80,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);

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

@@ -59,11 +59,19 @@ class GenericContainer {
         return this.imageName.string === (0, reaper_1.getReaperImage)();
     }
     async start() {
+        const shouldPull = this.pullPolicy.shouldPull();
         const client = await (0, container_runtime_1.getContainerRuntimeClient)();
-        await client.image.pull(this.imageName, {
-            force: this.pullPolicy.shouldPull(),
-            platform: this.createOpts.platform,
-        });
+        if (shouldPull === "never") {
+            if (!(await client.image.exists(this.imageName))) {
+                throw new Error(`Image "${this.imageName.string}" does not exist locally and pull policy is "never"`);
+            }
+        }
+        else {
+            await client.image.pull(this.imageName, {
+                force: shouldPull,
+                platform: this.createOpts.platform,
+            });
+        }
         if (this.beforeContainerCreated) {
             await this.beforeContainerCreated();
         }

package/build/utils/pull-policy.d.ts

@@ -1,7 +1,8 @@
 export interface ImagePullPolicy {
-    shouldPull(): boolean;
+    shouldPull(): boolean | "never";
 }
 export declare class PullPolicy {
     static defaultPolicy(): ImagePullPolicy;
     static alwaysPull(): ImagePullPolicy;
+    static neverPull(): ImagePullPolicy;
 }

package/build/utils/pull-policy.js

@@ -11,6 +11,11 @@ class AlwaysPullPolicy {
         return true;
     }
 }
+class NeverPullPolicy {
+    shouldPull() {
+        return "never";
+    }
+}
 class PullPolicy {
     static defaultPolicy() {
         return new DefaultPullPolicy();
@@ -18,5 +23,8 @@ class PullPolicy {
     static alwaysPull() {
         return new AlwaysPullPolicy();
     }
+    static neverPull() {
+        return new NeverPullPolicy();
+    }
 }
 exports.PullPolicy = PullPolicy;

package/build/version.d.ts

@@ -1 +1 @@
-export declare const LIB_VERSION = "12.1.0";
+export declare const LIB_VERSION = "12.2.0";

package/build/version.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LIB_VERSION = void 0;
-exports.LIB_VERSION = "12.1.0";
+exports.LIB_VERSION = "12.2.0";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testcontainers",
-  "version": "12.1.0",
+  "version": "12.2.0",
   "author": "Cristian Greco",
   "license": "MIT",
   "keywords": [
@@ -36,7 +36,7 @@
     "async-lock": "^1.4.1",
     "byline": "^5.0.0",
     "debug": "^4.4.3",
-    "docker-compose": "^1.4.2",
+    "docker-compose": "^1.5.0",
     "dockerode": "^5.0.1",
     "get-port": "^5.1.1",
     "proper-lockfile": "^4.1.2",
@@ -44,7 +44,7 @@
     "ssh-remote-port-forward": "^1.0.4",
     "tar-fs": "^3.1.3",
     "tmp": "^0.2.7",
-    "undici": "^8.9.0"
+    "undici": "^8.10.2"
   },
   "devDependencies": {
     "@types/archiver": "^7.0.0",