testcontainers 8.9.0 → 8.10.1

package/README.md

@@ -40,6 +40,8 @@ The following environment variables are supported:
 
 - `TESTCONTAINERS_RYUK_PRIVILEGED=true` Run [ryuk](#ryuk) as a privileged container
 - `TESTCONTAINERS_RYUK_DISABLED=true` Disable [ryuk](#ryuk)
+- `TESTCONTAINERS_RYUK_PORT=65515` Explicitly set [ryuk](#ryuk) host port (not recommended)
+- `TESTCONTAINERS_SSHD_PORT=65515` Explicitly set [SSHd](#SSHd) host port (not recommended)
 - `RYUK_CONTAINER_IMAGE=registry.mycompany.com/mirror/ryuk:0.3.0` Custom image for [ryuk](#ryuk)
 - `SSHD_CONTAINER_IMAGE=registry.mycompany.com/mirror/sshd:1.0.0` Custom image for [SSHd](#SSHd)
 

package/dist/dockerfile-parser.js

@@ -20,8 +20,8 @@ const getDockerfileImages = (dockerfile) => __awaiter(void 0, void 0, void 0, fu
             .split(os_1.EOL)
             .filter((line) => line.toUpperCase().startsWith("FROM"))
             .map((line) => {
-            const parts = line.split(" ");
-            return parts[parts.length - 1];
+            const parts = line.split(" ").filter((part) => part !== "");
+            return parts[1];
         })
             .reduce((prev, next) => prev.add(next), new Set())
             .values()).map((image) => docker_image_name_1.DockerImageName.fromString(image));

package/dist/port-forwarder.js

@@ -56,9 +56,12 @@ class PortForwarderInstance {
             logger_1.log.debug(`Creating new Port Forwarder`);
             const username = "root";
             const password = new uuid_1.RandomUuid().nextUuid();
+            const containerPort = process.env["TESTCONTAINERS_SSHD_PORT"]
+                ? { container: 22, host: Number(process.env["TESTCONTAINERS_SSHD_PORT"]) }
+                : 22;
             const container = yield new generic_container_1.GenericContainer(images_1.SSHD_IMAGE)
                 .withName(`testcontainers-port-forwarder-${session_id_1.sessionId}`)
-                .withExposedPorts(22)
+                .withExposedPorts(containerPort)
                 .withEnv("PASSWORD", password)
                 .withCmd([
                 "sh",

package/dist/reaper.js

@@ -81,10 +81,13 @@ class ReaperInstance {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const dockerSocket = (_a = process.env["TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE"]) !== null && _a !== void 0 ? _a : "/var/run/docker.sock";
+            const containerPort = process.env["TESTCONTAINERS_RYUK_PORT"]
+                ? { container: 8080, host: Number(process.env["TESTCONTAINERS_RYUK_PORT"]) }
+                : 8080;
             logger_1.log.debug(`Creating new Reaper for session: ${session_id_1.sessionId}`);
             const container = new generic_container_1.GenericContainer(images_1.REAPER_IMAGE)
                 .withName(`testcontainers-ryuk-${session_id_1.sessionId}`)
-                .withExposedPorts(8080)
+                .withExposedPorts(containerPort)
                 .withBindMount(dockerSocket, "/var/run/docker.sock")
                 .withWaitStrategy(wait_1.Wait.forLogMessage(/.+ Started!/));
             if (this.isPrivileged()) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "testcontainers",
   "author": "Cristian Greco",
-  "version": "8.9.0",
+  "version": "8.10.1",
   "main": "dist/index",
   "types": "dist/index",
   "keywords": [