testcontainers 12.0.1 → 12.0.2

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

@@ -60,6 +60,7 @@ export declare class GenericContainer implements TestContainer {
     withNetworkAliases(...networkAliases: string[]): this;
     withExtraHosts(extraHosts: ExtraHost[]): this;
     withExposedPorts(...ports: PortWithOptionalBinding[]): this;
+    protected hasExposedPort(port: PortWithOptionalBinding): boolean;
     withBindMounts(bindMounts: BindMount[]): this;
     withHealthCheck(healthCheck: HealthCheck): this;
     withStartupTimeout(startupTimeoutMs: number): this;

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

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GenericContainer = void 0;
-const archiver_1 = __importDefault(require("archiver"));
+const archiver_1 = require("archiver");
 const async_lock_1 = __importDefault(require("async-lock"));
 const fs_1 = require("fs");
 const common_1 = require("../common");
@@ -186,7 +186,7 @@ class GenericContainer {
         }
     }
     async createArchiveToCopyToContainer() {
-        const tar = (0, archiver_1.default)("tar");
+        const tar = new archiver_1.TarArchive();
         const filesToCopyWithStats = await Promise.all(this.filesToCopy.map(async (fileToCopy) => ({
             ...fileToCopy,
             stats: await fs_1.promises.stat(fileToCopy.source),
@@ -305,6 +305,11 @@ class GenericContainer {
         };
         return this;
     }
+    hasExposedPort(port) {
+        const containerPort = (0, port_1.getContainerPort)(port);
+        const protocol = (0, port_1.getProtocol)(port);
+        return Object.hasOwn(this.createOpts.ExposedPorts ?? {}, `${containerPort}/${protocol}`);
+    }
     withBindMounts(bindMounts) {
         this.hostConfig.Binds = bindMounts
             .map((bindMount) => ({ mode: "rw", ...bindMount }))

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

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StartedGenericContainer = void 0;
-const archiver_1 = __importDefault(require("archiver"));
+const archiver_1 = require("archiver");
 const async_lock_1 = __importDefault(require("async-lock"));
 const fs_1 = require("fs");
 const common_1 = require("../common");
@@ -151,7 +151,7 @@ class StartedGenericContainer {
     async copyFilesToContainer(filesToCopy) {
         common_1.log.debug(`Copying files to container...`, { containerId: this.container.id });
         const client = await (0, container_runtime_1.getContainerRuntimeClient)();
-        const tar = (0, archiver_1.default)("tar");
+        const tar = new archiver_1.TarArchive();
         const filesToCopyWithStats = await Promise.all(filesToCopy.map(async (fileToCopy) => ({
             ...fileToCopy,
             stats: await fs_1.promises.stat(fileToCopy.source),
@@ -164,7 +164,7 @@ class StartedGenericContainer {
     async copyDirectoriesToContainer(directoriesToCopy) {
         common_1.log.debug(`Copying directories to container...`, { containerId: this.container.id });
         const client = await (0, container_runtime_1.getContainerRuntimeClient)();
-        const tar = (0, archiver_1.default)("tar");
+        const tar = new archiver_1.TarArchive();
         directoriesToCopy.forEach(({ source, target }) => tar.directory(source, target));
         tar.finalize();
         await client.container.putArchive(this.container, tar, "/");
@@ -173,7 +173,7 @@ class StartedGenericContainer {
     async copyContentToContainer(contentsToCopy) {
         common_1.log.debug(`Copying content to container...`, { containerId: this.container.id });
         const client = await (0, container_runtime_1.getContainerRuntimeClient)();
-        const tar = (0, archiver_1.default)("tar");
+        const tar = new archiver_1.TarArchive();
         contentsToCopy.forEach(({ content, target, mode }) => tar.append(content, { name: target, mode: mode }));
         tar.finalize();
         await client.container.putArchive(this.container, tar, "/");

package/build/utils/bound-ports.js

@@ -49,17 +49,16 @@ class BoundPorts {
     }
     filter(ports) {
         const boundPorts = new BoundPorts();
-        const containerPortsWithProtocol = new Map();
+        const containerPortsWithProtocol = new Set();
         ports.forEach((port) => {
             const containerPort = (0, port_1.getContainerPort)(port);
-            const protocol = (0, port_1.getProtocol)(port);
-            containerPortsWithProtocol.set(containerPort, protocol);
+            const protocol = (0, port_1.getProtocol)(port).toLowerCase();
+            containerPortsWithProtocol.add(`${containerPort}/${protocol}`);
         });
         for (const [internalPortWithProtocol, hostPort] of this.iterator()) {
             const [internalPortStr, protocol] = internalPortWithProtocol.split("/");
             const internalPort = parseInt(internalPortStr, 10);
-            if (containerPortsWithProtocol.has(internalPort) &&
-                containerPortsWithProtocol.get(internalPort)?.toLowerCase() === protocol?.toLowerCase()) {
+            if (containerPortsWithProtocol.has(`${internalPort}/${protocol?.toLowerCase()}`)) {
                 boundPorts.setBinding(internalPortWithProtocol, hostPort);
             }
         }

package/build/version.d.ts

@@ -1 +1 @@
-export declare const LIB_VERSION = "12.0.1";
+export declare const LIB_VERSION = "12.0.2";

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.0.1";
+exports.LIB_VERSION = "12.0.2";

package/build/wait-strategies/log-wait-strategy.js

@@ -28,6 +28,9 @@ class LogWaitStrategy extends wait_strategy_1.AbstractWaitStrategy {
             }, this.startupTimeoutMs);
             const comparisonFn = (line) => {
                 if (this.message instanceof RegExp) {
+                    if (this.message.global || this.message.sticky) {
+                        this.message.lastIndex = 0;
+                    }
                     return this.message.test(line);
                 }
                 else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testcontainers",
-  "version": "12.0.1",
+  "version": "12.0.2",
   "author": "Cristian Greco",
   "license": "MIT",
   "keywords": [
@@ -32,7 +32,7 @@
   "dependencies": {
     "@balena/dockerignore": "^1.0.2",
     "@types/dockerode": "^4.0.1",
-    "archiver": "^7.0.1",
+    "archiver": "^8.0.0",
     "async-lock": "^1.4.1",
     "byline": "^5.0.0",
     "debug": "^4.4.3",
@@ -43,11 +43,11 @@
     "properties-reader": "^3.0.1",
     "ssh-remote-port-forward": "^1.0.4",
     "tar-fs": "^3.1.2",
-    "tmp": "^0.2.6",
-    "undici": "^7.25.0"
+    "tmp": "^0.2.7",
+    "undici": "^8.3.0"
   },
   "devDependencies": {
-    "@types/archiver": "^7.0.0",
+    "@types/archiver": "^8.0.0",
     "@types/async-lock": "^1.4.2",
     "@types/byline": "^4.2.36",
     "@types/debug": "^4.1.13",