testcontainers 7.20.0 → 7.20.4

package/README.md

@@ -16,15 +16,15 @@ npm i -D testcontainers
 
 The following environment variables are supported:
 
-- `DEBUG` | `testcontainers` | See output
-- `DEBUG` | `testcontainers:containers` | See container output
-- `DEBUG` | `testcontainers*` | See all output
-- `DOCKER_HOST` | `tcp://docker:2375` | Daemon socket to connect to
-- `TESTCONTAINERS_HOST_OVERRIDE` | `docker.svc.local` | Docker's host on which ports are exposed
-- `TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE` | `/var/run/docker.sock` | Path to Docker's socket. Used by Ryuk and a few other containers that need to perform Docker actions
-- `TESTCONTAINERS_RYUK_DISABLED` | `true` | Disable [ryuk](#ryuk)
-- `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)
+- `DEBUG=testcontainers` See output
+- `DEBUG=testcontainers:containers` See container output
+- `DEBUG=testcontainers*` See all output
+- `DOCKER_HOST=tcp://docker:2375` Daemon socket to connect to
+- `TESTCONTAINERS_HOST_OVERRIDE=docker.svc.local` Docker's host on which ports are exposed
+- `TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE=/var/run/docker.sock` Path to Docker's socket. Used by [ryuk](#ryuk) and other [auxiliary containers](#auxiliary-containers) that need to perform Docker actions
+- `TESTCONTAINERS_RYUK_DISABLED=true` Disable [ryuk](#ryuk)
+- `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)
 
 ## Modules
 
@@ -68,12 +68,7 @@ describe("GenericContainer", () => {
 Using TypeScript:
 
 ```typescript
-import { 
-  TestContainer, 
-  StartedTestContainer, 
-  StoppedTestContainer, 
-  GenericContainer 
-} from "testcontainers";
+import { TestContainer, StartedTestContainer, StoppedTestContainer, GenericContainer } from "testcontainers";
 
 const container: TestContainer = new GenericContainer("alpine");
 const startedContainer: StartedTestContainer = await container.start();

package/dist/docker-compose/functions/docker-compose-down.js

@@ -20,8 +20,9 @@ const dockerComposeDown = (options) => __awaiter(void 0, void 0, void 0, functio
         logger_1.log.info(`Downed DockerCompose environment`);
     }
     catch (err) {
-        logger_1.log.error(`Failed to down DockerCompose environment: ${err}`);
-        throw new Error(err);
+        const errorMessage = err.err || err.message || err;
+        logger_1.log.error(`Failed to down DockerCompose environment: ${errorMessage}`);
+        throw new Error(errorMessage);
     }
 });
 exports.dockerComposeDown = dockerComposeDown;

package/dist/docker-compose/functions/docker-compose-stop.js

@@ -20,8 +20,9 @@ const dockerComposeStop = (options) => __awaiter(void 0, void 0, void 0, functio
         logger_1.log.info(`Stopped DockerCompose environment`);
     }
     catch (err) {
-        logger_1.log.error(`Failed to stop DockerCompose environment: ${err}`);
-        throw new Error(err);
+        const errorMessage = err.err || err.message || err;
+        logger_1.log.error(`Failed to stop DockerCompose environment: ${errorMessage}`);
+        throw new Error(errorMessage);
     }
 });
 exports.dockerComposeStop = dockerComposeStop;

package/dist/docker-compose/functions/docker-compose-up.js

@@ -26,14 +26,15 @@ const dockerComposeUp = (options, services) => __awaiter(void 0, void 0, void 0,
         logger_1.log.info(`Upped DockerCompose environment`);
     }
     catch (err) {
-        logger_1.log.error(`Failed to up DockerCompose environment: ${err}`);
+        const errorMessage = err.err || err.message || err;
+        logger_1.log.error(`Failed to up DockerCompose environment: ${errorMessage}`);
         try {
             yield docker_compose_down_1.dockerComposeDown(options);
         }
         catch (_a) {
             logger_1.log.warn(`Failed to down DockerCompose environment after failed up`);
         }
-        throw new Error(err);
+        throw new Error(errorMessage);
     }
 });
 exports.dockerComposeUp = dockerComposeUp;

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

@@ -100,7 +100,7 @@ class DockerComposeEnvironment {
     }
     getBoundPorts(containerInfo) {
         const boundPorts = new bound_ports_1.BoundPorts();
-        containerInfo.Ports.forEach((port) => boundPorts.setBinding(port.PrivatePort, port.PublicPort));
+        containerInfo.Ports.filter((port) => port.PublicPort !== undefined).forEach((port) => boundPorts.setBinding(port.PrivatePort, port.PublicPort));
         return boundPorts;
     }
     waitForContainer(container, containerName, boundPorts) {

package/dist/docker-image-name.js

@@ -8,7 +8,15 @@ class DockerImageName {
         this.image = image;
         this.tag = tag;
         if (this.registry) {
-            this.string = `${this.registry}/${this.image}:${this.tag}`;
+            if (this.tag.startsWith("sha256:")) {
+                this.string = `${this.registry}/${this.image}@${this.tag}`;
+            }
+            else {
+                this.string = `${this.registry}/${this.image}:${this.tag}`;
+            }
+        }
+        else if (this.tag.startsWith("sha256:")) {
+            this.string = `${this.image}@${this.tag}`;
         }
         else {
             this.string = `${this.image}:${this.tag}`;

package/package.json

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