testcontainers 8.10.1 → 8.10.2-beta.0

package/dist/docker/docker-client.d.ts

@@ -5,5 +5,5 @@ declare type DockerClient = {
     host: Host;
     dockerode: Dockerode;
 };
-export declare const dockerClient: Promise<DockerClient>;
+export declare const dockerClient: () => Promise<DockerClient>;
 export {};

package/dist/docker/docker-client.js

@@ -153,4 +153,11 @@ const findGateway = (dockerode) => __awaiter(void 0, void 0, void 0, function* (
 });
 const findDefaultGateway = (dockerode) => __awaiter(void 0, void 0, void 0, function* () { return (0, run_in_container_1.runInContainer)(dockerode, "alpine:3.14", ["sh", "-c", "ip route|awk '/default/ { print $3 }'"]); });
 const isInContainer = () => (0, fs_1.existsSync)("/.dockerenv");
-exports.dockerClient = getDockerClient();
+let _dockerClient;
+const dockerClient = () => {
+    if (!_dockerClient) {
+        _dockerClient = getDockerClient();
+    }
+    return _dockerClient;
+};
+exports.dockerClient = dockerClient;

package/dist/docker/functions/container/create-container.js

@@ -17,7 +17,7 @@ const create_labels_1 = require("../create-labels");
 const createContainer = (options) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         logger_1.log.info(`Creating container for image: ${options.imageName}`);
-        const { dockerode } = yield docker_client_1.dockerClient;
+        const { dockerode } = yield (0, docker_client_1.dockerClient)();
         return yield dockerode.createContainer({
             name: options.name,
             User: options.user,

package/dist/docker/functions/container/get-container.js

@@ -15,7 +15,7 @@ const logger_1 = require("../../../logger");
 const labels_1 = require("../../../labels");
 const getContainerById = (id) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const { dockerode } = yield docker_client_1.dockerClient;
+        const { dockerode } = yield (0, docker_client_1.dockerClient)();
         return dockerode.getContainer(id);
     }
     catch (err) {
@@ -26,7 +26,7 @@ const getContainerById = (id) => __awaiter(void 0, void 0, void 0, function* ()
 exports.getContainerById = getContainerById;
 const getContainerByHash = (hash) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const { dockerode } = yield docker_client_1.dockerClient;
+        const { dockerode } = yield (0, docker_client_1.dockerClient)();
         const containers = yield dockerode.listContainers({
             limit: 1,
             filters: {

package/dist/docker/functions/container/list-containers.js

@@ -14,7 +14,7 @@ const docker_client_1 = require("../../docker-client");
 const logger_1 = require("../../../logger");
 const listContainers = () => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const { dockerode } = yield docker_client_1.dockerClient;
+        const { dockerode } = yield (0, docker_client_1.dockerClient)();
         return yield dockerode.listContainers();
     }
     catch (err) {

package/dist/docker/functions/demux-stream.js

@@ -16,7 +16,7 @@ const docker_client_1 = require("../docker-client");
 const demuxStream = (stream) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const demuxedStream = new stream_1.PassThrough({ autoDestroy: true, encoding: "utf-8" });
-        const { dockerode } = yield docker_client_1.dockerClient;
+        const { dockerode } = yield (0, docker_client_1.dockerClient)();
         dockerode.modem.demuxStream(stream, demuxedStream, demuxedStream);
         stream.on("end", () => demuxedStream.end());
         demuxedStream.on("close", () => {

package/dist/docker/functions/get-info.js

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDockerInfo = void 0;
 const docker_client_1 = require("../docker-client");
 const getDockerInfo = () => __awaiter(void 0, void 0, void 0, function* () {
-    const { dockerode } = yield docker_client_1.dockerClient;
+    const { dockerode } = yield (0, docker_client_1.dockerClient)();
     const info = yield dockerode.info();
     return {
         serverVersion: info.ServerVersion,

package/dist/docker/functions/image/build-image.js

@@ -36,7 +36,7 @@ const buildImage = (options) => __awaiter(void 0, void 0, void 0, function* () {
                 }
             },
         });
-        const { dockerode } = yield docker_client_1.dockerClient;
+        const { dockerode } = yield (0, docker_client_1.dockerClient)();
         return new Promise((resolve) => dockerode
             .buildImage(tarStream, {
             dockerfile: options.dockerfileName,

package/dist/docker/functions/image/list-images.js

@@ -15,7 +15,7 @@ const docker_client_1 = require("../../docker-client");
 const logger_1 = require("../../../logger");
 const listImages = () => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const { dockerode } = yield docker_client_1.dockerClient;
+        const { dockerode } = yield (0, docker_client_1.dockerClient)();
         const images = yield dockerode.listImages();
         return images.reduce((dockerImageNames, image) => {
             var _a;

package/dist/docker/functions/image/pull-image.js

@@ -21,7 +21,7 @@ const pullImage = (options) => __awaiter(void 0, void 0, void 0, function* () {
             return;
         }
         logger_1.log.info(`Pulling image: ${options.imageName}`);
-        const { dockerode } = yield docker_client_1.dockerClient;
+        const { dockerode } = yield (0, docker_client_1.dockerClient)();
         const stream = yield dockerode.pull(options.imageName.toString(), { authconfig: options.authConfig });
         yield new pull_stream_parser_1.PullStreamParser(options.imageName, logger_1.log).consume(stream);
     }

package/dist/docker/functions/network/connect-network.js

@@ -15,7 +15,7 @@ const docker_client_1 = require("../../docker-client");
 const connectNetwork = (options) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         logger_1.log.info(`Connecting container ${options.containerId} to network ${options.networkId}`);
-        const { dockerode } = yield docker_client_1.dockerClient;
+        const { dockerode } = yield (0, docker_client_1.dockerClient)();
         const network = dockerode.getNetwork(options.networkId);
         yield network.connect({ Container: options.containerId, EndpointConfig: { Aliases: options.networkAliases } });
     }

package/dist/docker/functions/network/create-network.js

@@ -16,7 +16,7 @@ const create_labels_1 = require("../create-labels");
 const createNetwork = (options) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         logger_1.log.info(`Creating network ${options.name}`);
-        const { dockerode } = yield docker_client_1.dockerClient;
+        const { dockerode } = yield (0, docker_client_1.dockerClient)();
         const network = yield dockerode.createNetwork({
             Name: options.name,
             CheckDuplicate: options.checkDuplicate,

package/dist/docker/functions/network/remove-network.js

@@ -15,7 +15,7 @@ const docker_client_1 = require("../../docker-client");
 const removeNetwork = (id) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         logger_1.log.info(`Removing network ${id}`);
-        const { dockerode } = yield docker_client_1.dockerClient;
+        const { dockerode } = yield (0, docker_client_1.dockerClient)();
         const network = dockerode.getNetwork(id);
         const { message } = yield network.remove();
         if (message) {

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

@@ -119,7 +119,7 @@ class DockerComposeEnvironment {
                     }
                     throw err;
                 }
-                return new started_generic_container_1.StartedGenericContainer(container, (yield docker_client_1.dockerClient).host, inspectResult, boundPorts, containerName);
+                return new started_generic_container_1.StartedGenericContainer(container, (yield (0, docker_client_1.dockerClient)()).host, inspectResult, boundPorts, containerName);
             })))).reduce((map, startedGenericContainer) => {
                 const containerName = startedGenericContainer.getName();
                 return Object.assign(Object.assign({}, map), { [containerName]: startedGenericContainer });
@@ -130,7 +130,7 @@ class DockerComposeEnvironment {
     }
     waitForContainer(container, containerName, boundPorts) {
         return __awaiter(this, void 0, void 0, function* () {
-            const waitStrategy = this.getWaitStrategy((yield docker_client_1.dockerClient).host, container, containerName);
+            const waitStrategy = this.getWaitStrategy((yield (0, docker_client_1.dockerClient)()).host, container, containerName);
             yield waitStrategy.withStartupTimeout(this.startupTimeout).waitUntilReady(container, boundPorts);
         });
     }

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

@@ -119,7 +119,7 @@ class GenericContainer {
             const inspectResult = yield (0, inspect_container_1.inspectContainer)(startedContainer);
             const boundPorts = bound_ports_1.BoundPorts.fromInspectResult(inspectResult).filter(this.ports);
             yield this.waitForContainer(startedContainer, boundPorts);
-            return new started_generic_container_1.StartedGenericContainer(startedContainer, (yield docker_client_1.dockerClient).host, inspectResult, boundPorts, inspectResult.name);
+            return new started_generic_container_1.StartedGenericContainer(startedContainer, (yield (0, docker_client_1.dockerClient)()).host, inspectResult, boundPorts, inspectResult.name);
         });
     }
     startContainer(createContainerOptions) {
@@ -156,7 +156,7 @@ class GenericContainer {
             const inspectResult = yield (0, inspect_container_1.inspectContainer)(container);
             const boundPorts = bound_ports_1.BoundPorts.fromInspectResult(inspectResult).filter(this.ports);
             yield this.waitForContainer(container, boundPorts);
-            const startedContainer = new started_generic_container_1.StartedGenericContainer(container, (yield docker_client_1.dockerClient).host, inspectResult, boundPorts, inspectResult.name);
+            const startedContainer = new started_generic_container_1.StartedGenericContainer(container, (yield (0, docker_client_1.dockerClient)()).host, inspectResult, boundPorts, inspectResult.name);
             if (this.postStart) {
                 yield this.postStart(startedContainer, inspectResult, boundPorts);
             }
@@ -263,7 +263,7 @@ class GenericContainer {
     waitForContainer(container, boundPorts) {
         return __awaiter(this, void 0, void 0, function* () {
             logger_1.log.debug(`Waiting for container to be ready: ${container.id}`);
-            const waitStrategy = this.getWaitStrategy((yield docker_client_1.dockerClient).host, container);
+            const waitStrategy = this.getWaitStrategy((yield (0, docker_client_1.dockerClient)()).host, container);
             try {
                 yield waitStrategy.withStartupTimeout(this.startupTimeout).waitUntilReady(container, boundPorts);
                 logger_1.log.info("Container is ready");

package/dist/port-forwarder.js

@@ -69,7 +69,7 @@ class PortForwarderInstance {
                 `echo "${username}:$PASSWORD" | chpasswd && /usr/sbin/sshd -D -o PermitRootLogin=yes -o AddressFamily=inet -o GatewayPorts=yes`,
             ])
                 .start();
-            const host = (yield docker_client_1.dockerClient).host;
+            const host = (yield (0, docker_client_1.dockerClient)()).host;
             const port = container.getMappedPort(22);
             logger_1.log.debug(`Connecting to Port Forwarder on ${host}:${port}`);
             const connection = yield (0, ssh_remote_port_forward_1.createSshConnection)({ host, port, username, password });

package/package.json

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