testcontainers 8.8.0 → 8.8.1-beta.0

package/README.md

@@ -18,18 +18,26 @@ npm i -D testcontainers
 
 The following environment variables are supported:
 
+### Logs
+
 - `DEBUG=testcontainers` Enable testcontainers logs
 - `DEBUG=testcontainers:containers` Enable container logs
 - `DEBUG=testcontainers*` Enable all logs
+
+### Docker
+
 - `DOCKER_HOST=tcp://docker:2375` Sets the URL of the docker daemon
 - `DOCKER_TLS_VERIFY=1` When set to `1`, enables TLS communication with the docker
   daemon
 - `DOCKER_CERT_PATH=/some/path` Configures the path to the `ca.pem`, `cert.pem`, and `key.pem` files used for TLS
-  verification. Defaults to `~/.docker`
-- `DOCKER_CONFIG=/some/path` Configures the path to the `config.json`. Defaults to `~/.docker`
+  verification
+- `DOCKER_CONFIG=/some/path` Configures the path to the `config.json`
 - `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
+
 - `TESTCONTAINERS_RYUK_PRIVILEGED=true` Run [ryuk](#ryuk) as a privileged container
 - `TESTCONTAINERS_RYUK_DISABLED=true` Disable [ryuk](#ryuk)
 - `RYUK_CONTAINER_IMAGE=registry.mycompany.com/mirror/ryuk:0.3.0` Custom image for [ryuk](#ryuk)

package/dist/docker/docker-client.js

@@ -60,18 +60,21 @@ class ConfigurationStrategy {
         return __awaiter(this, void 0, void 0, function* () {
             const { DOCKER_HOST, DOCKER_TLS_VERIFY, DOCKER_CERT_PATH } = process.env;
             const dockerOptions = {};
-            const url = new url_1.URL(DOCKER_HOST);
-            const dockerHost = url.host === "" ? `tcp://${DOCKER_HOST}` : DOCKER_HOST;
-            const { hostname, port } = new url_1.URL(dockerHost);
-            dockerOptions.host = hostname;
-            dockerOptions.port = port;
+            const { hostname, port } = new url_1.URL(DOCKER_HOST);
+            if (hostname !== "") {
+                dockerOptions.host = hostname;
+                dockerOptions.port = port;
+            }
+            else {
+                dockerOptions.socketPath = DOCKER_HOST;
+            }
             if (DOCKER_TLS_VERIFY === "1" && DOCKER_CERT_PATH !== undefined) {
                 dockerOptions.ca = yield fs_1.promises.readFile(path_1.default.resolve(DOCKER_CERT_PATH, "ca.pem"));
                 dockerOptions.cert = yield fs_1.promises.readFile(path_1.default.resolve(DOCKER_CERT_PATH, "cert.pem"));
                 dockerOptions.key = yield fs_1.promises.readFile(path_1.default.resolve(DOCKER_CERT_PATH, "key.pem"));
             }
             return {
-                uri: dockerHost,
+                uri: DOCKER_HOST,
                 dockerode: new dockerode_1.default(dockerOptions),
             };
         });

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

@@ -39,6 +39,7 @@ export declare class GenericContainer implements TestContainer {
     private reuseContainer;
     private startContainer;
     protected postStart?(container: StartedTestContainer, inspectResult: InspectResult, boundPorts: BoundPorts): Promise<void>;
+    protected get hasExposedPorts(): boolean;
     withCmd(cmd: Command[]): this;
     withName(name: ContainerName): this;
     withLabels(labels: Labels): this;

package/dist/generic-container/generic-container.js

@@ -163,6 +163,9 @@ class GenericContainer {
             return startedContainer;
         });
     }
+    get hasExposedPorts() {
+        return this.ports.length !== 0;
+    }
     withCmd(cmd) {
         this.cmd = cmd;
         return this;

package/dist/modules/arangodb/arangodb-container.js

@@ -13,7 +13,7 @@ exports.StartedArangoContainer = exports.ArangoDBContainer = void 0;
 const __1 = require("../..");
 const uuid_1 = require("../../uuid");
 const abstract_started_container_1 = require("../abstract-started-container");
-const PORT = 8529;
+const ARANGODB_PORT = 8529;
 const USERNAME = "root";
 class ArangoDBContainer extends __1.GenericContainer {
     constructor(image = "arangodb:3.7.13", password = new uuid_1.RandomUuid().nextUuid()) {
@@ -29,7 +29,7 @@ class ArangoDBContainer extends __1.GenericContainer {
             start: { get: () => super.start }
         });
         return __awaiter(this, void 0, void 0, function* () {
-            this.withExposedPorts(PORT)
+            this.withExposedPorts(...(this.hasExposedPorts ? this.ports : [ARANGODB_PORT]))
                 .withWaitStrategy(__1.Wait.forLogMessage("Have fun!"))
                 .withEnv("ARANGO_ROOT_PASSWORD", this.password)
                 .withStartupTimeout(120000);
@@ -43,7 +43,7 @@ class StartedArangoContainer extends abstract_started_container_1.AbstractStarte
         super(startedTestContainer);
         this.password = password;
         this.host = this.startedTestContainer.getHost();
-        this.port = this.startedTestContainer.getMappedPort(PORT);
+        this.port = this.startedTestContainer.getMappedPort(ARANGODB_PORT);
     }
     getTcpUrl() {
         return `tcp://${this.host}:${this.port}/`;

package/dist/modules/elasticsearch/elasticsearch-container.js

@@ -22,7 +22,7 @@ class ElasticsearchContainer extends __1.GenericContainer {
             start: { get: () => super.start }
         });
         return __awaiter(this, void 0, void 0, function* () {
-            this.withExposedPorts(ELASTIC_SEARCH_HTTP_PORT)
+            this.withExposedPorts(...(this.hasExposedPorts ? this.ports : [ELASTIC_SEARCH_HTTP_PORT]))
                 .withEnv("discovery.type", "single-node")
                 .withStartupTimeout(120000);
             return new StartedElasticsearchContainer(yield _super.start.call(this));

package/dist/modules/mysql/mysql-container.js

@@ -13,6 +13,7 @@ exports.StartedMySqlContainer = exports.MySqlContainer = void 0;
 const generic_container_1 = require("../../generic-container/generic-container");
 const uuid_1 = require("../../uuid");
 const abstract_started_container_1 = require("../abstract-started-container");
+const MYSQL_PORT = 3306;
 class MySqlContainer extends generic_container_1.GenericContainer {
     constructor(image = "mysql:8.0.26") {
         super(image);
@@ -42,7 +43,7 @@ class MySqlContainer extends generic_container_1.GenericContainer {
             start: { get: () => super.start }
         });
         return __awaiter(this, void 0, void 0, function* () {
-            this.withExposedPorts(3306)
+            this.withExposedPorts(...(this.hasExposedPorts ? this.ports : [MYSQL_PORT]))
                 .withEnv("MYSQL_DATABASE", this.database)
                 .withEnv("MYSQL_ROOT_PASSWORD", this.rootPassword)
                 .withEnv("MYSQL_USER", this.username)

package/dist/modules/neo4j/neo4j-container.js

@@ -39,7 +39,7 @@ class Neo4jContainer extends __1.GenericContainer {
             start: { get: () => super.start }
         });
         return __awaiter(this, void 0, void 0, function* () {
-            this.withExposedPorts(BOLT_PORT, HTTP_PORT)
+            this.withExposedPorts(...(this.hasExposedPorts ? this.ports : [BOLT_PORT, HTTP_PORT]))
                 .withWaitStrategy(__1.Wait.forLogMessage("Started."))
                 .withEnv("NEO4J_AUTH", `${USERNAME}/${this.password}`)
                 .withStartupTimeout(120000);

package/dist/modules/postgresql/postgresql-container.js

@@ -13,6 +13,7 @@ exports.StartedPostgreSqlContainer = exports.PostgreSqlContainer = void 0;
 const generic_container_1 = require("../../generic-container/generic-container");
 const uuid_1 = require("../../uuid");
 const abstract_started_container_1 = require("../abstract-started-container");
+const POSTGRES_PORT = 5432;
 class PostgreSqlContainer extends generic_container_1.GenericContainer {
     constructor(image = "postgres:13.3-alpine") {
         super(image);
@@ -37,7 +38,7 @@ class PostgreSqlContainer extends generic_container_1.GenericContainer {
             start: { get: () => super.start }
         });
         return __awaiter(this, void 0, void 0, function* () {
-            this.withExposedPorts(5432)
+            this.withExposedPorts(...(this.hasExposedPorts ? this.ports : [POSTGRES_PORT]))
                 .withEnv("POSTGRES_DB", this.database)
                 .withEnv("POSTGRES_USER", this.username)
                 .withEnv("POSTGRES_PASSWORD", this.password)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "testcontainers",
   "author": "Cristian Greco",
-  "version": "8.8.0",
+  "version": "8.8.1-beta.0",
   "main": "dist/index",
   "types": "dist/index",
   "keywords": [