testcontainers 7.20.1 → 7.20.5

package/dist/docker/get-docker-host.js

@@ -21,48 +21,40 @@ const getDockerHost = (dockerode) => __awaiter(void 0, void 0, void 0, function*
     if (process.env.DOCKER_HOST) {
         logger_1.log.info(`Detected DOCKER_HOST environment variable: ${process.env.DOCKER_HOST}`);
     }
-    for (const hostStrategy of hostStrategies(dockerode)) {
+    for (const [hostStrategyName, hostStrategy] of Object.entries(hostStrategies(dockerode))) {
         const result = yield hostStrategy();
-        if (result && result.host) {
-            result.callback();
-            return result.host;
+        if (result) {
+            logger_1.log.info(`Docker host strategy ${hostStrategyName}: ${result}`);
+            return result;
         }
     }
-    logger_1.log.info(`Using fallback Docker host: ${DEFAULT_HOST}`);
+    logger_1.log.info(`Docker host strategy FALLBACK: ${DEFAULT_HOST}`);
     return DEFAULT_HOST;
 });
 exports.getDockerHost = getDockerHost;
-const hostStrategies = (dockerode) => [
-    () => __awaiter(void 0, void 0, void 0, function* () {
-        const host = dockerode.modem.host;
-        return { host, callback: () => logger_1.log.info(`Using Docker host from modem: ${host}`) };
-    }),
-    () => __awaiter(void 0, void 0, void 0, function* () {
-        const host = process.env["TESTCONTAINERS_HOST_OVERRIDE"];
-        return { host, callback: () => logger_1.log.info(`Using TESTCONTAINERS_HOST_OVERRIDE: ${host}`) };
-    }),
-    () => __awaiter(void 0, void 0, void 0, function* () {
+const hostStrategies = (dockerode) => ({
+    MODEM: () => __awaiter(void 0, void 0, void 0, function* () { return dockerode.modem.host; }),
+    TESTCONTAINERS_HOST_OVERRIDE: () => __awaiter(void 0, void 0, void 0, function* () { return process.env["TESTCONTAINERS_HOST_OVERRIDE"]; }),
+    OUTSIDE_CONTAINER: () => __awaiter(void 0, void 0, void 0, function* () {
         if (!isInContainer()) {
-            return { host: DEFAULT_HOST, callback: () => logger_1.log.info(`Using default Docker host: ${DEFAULT_HOST}`) };
+            return DEFAULT_HOST;
         }
     }),
-    () => __awaiter(void 0, void 0, void 0, function* () {
+    INSIDE_CONTAINER_NO_IPAM: () => __awaiter(void 0, void 0, void 0, function* () {
         const network = yield dockerode.getNetwork("bridge").inspect();
         if (!network.IPAM || !network.IPAM.Config) {
-            return {
-                host: DEFAULT_HOST,
-                callback: () => logger_1.log.info(`Using default Docker host from within container: ${DEFAULT_HOST}`),
-            };
-        }
-        const gateways = network.IPAM.Config.filter((config) => !!config.Gateway);
-        if (gateways.length > 0) {
-            const host = gateways[0].Gateway;
-            return { host, callback: () => logger_1.log.info(`Using Docker host from network gateway within container: ${host}`) };
+            return DEFAULT_HOST;
         }
     }),
-    () => __awaiter(void 0, void 0, void 0, function* () {
-        const host = yield run_in_container_1.runInContainer("alpine:3.5", ["sh", "-c", "ip route|awk '/default/ { print $3 }'"]);
-        return { host, callback: () => logger_1.log.info(`Using Docker host from evaluated gateway within container: ${host}`) };
+    INSIDE_CONTAINER_IPAM: () => __awaiter(void 0, void 0, void 0, function* () {
+        const network = yield dockerode.getNetwork("bridge").inspect();
+        if (network.IPAM && network.IPAM.Config) {
+            const gateways = network.IPAM.Config.filter((config) => !!config.Gateway);
+            if (gateways.length > 0) {
+                return gateways[0].Gateway;
+            }
+        }
     }),
-];
+    CONTAINER_GATEWAY: () => __awaiter(void 0, void 0, void 0, function* () { return yield run_in_container_1.runInContainer("alpine:3.5", ["sh", "-c", "ip route|awk '/default/ { print $3 }'"]); }),
+});
 const isInContainer = () => fs_1.default.existsSync("/.dockerenv");

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-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/dist/network.d.ts

@@ -1,7 +1,6 @@
 import { Uuid } from "./uuid";
 import { CreateNetworkOptions } from "./docker/functions/network/create-network";
 export declare class Network {
-    private readonly uuid;
     private readonly createNetworkOptions;
     constructor(createNetworkOptions?: Partial<CreateNetworkOptions>, uuid?: Uuid);
     start(): Promise<StartedNetwork>;

package/dist/network.js

@@ -17,8 +17,7 @@ const create_network_1 = require("./docker/functions/network/create-network");
 const remove_network_1 = require("./docker/functions/network/remove-network");
 class Network {
     constructor(createNetworkOptions = {}, uuid = new uuid_1.RandomUuid()) {
-        this.uuid = uuid;
-        this.createNetworkOptions = Object.assign({ name: this.uuid.nextUuid(), driver: "bridge", checkDuplicate: true, internal: false, attachable: false, ingress: false, enableIPv6: false }, createNetworkOptions);
+        this.createNetworkOptions = Object.assign({ name: uuid.nextUuid(), driver: "bridge", checkDuplicate: true, internal: false, attachable: false, ingress: false, enableIPv6: false }, createNetworkOptions);
     }
     start() {
         return __awaiter(this, void 0, void 0, function* () {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "testcontainers",
   "author": "Cristian Greco",
-  "version": "7.20.1",
+  "version": "7.20.5",
   "main": "dist/index",
   "types": "dist/index",
   "keywords": [
@@ -37,8 +37,8 @@
     "archiver": "^5.3.0",
     "byline": "^5.0.0",
     "debug": "^4.3.2",
-    "docker-compose": "^0.23.12",
-    "dockerode": "^3.3.0",
+    "docker-compose": "^0.23.13",
+    "dockerode": "^3.3.1",
     "get-port": "^5.1.1",
     "glob": "^7.1.7",
     "slash": "^3.0.0",
@@ -46,32 +46,32 @@
     "tar-fs": "^2.1.1"
   },
   "devDependencies": {
-    "@elastic/elasticsearch": "^7.13.0",
+    "@elastic/elasticsearch": "^7.14.1",
     "@types/byline": "^4.2.33",
-    "@types/debug": "4.1.6",
+    "@types/debug": "4.1.7",
     "@types/glob": "^7.1.4",
-    "@types/jest": "^26.0.24",
-    "@types/node": "^16.3.2",
+    "@types/jest": "^27.0.2",
+    "@types/node": "^16.9.4",
     "@types/node-fetch": "^2.5.11",
     "@types/pg": "^8.6.1",
     "@types/tar-fs": "^2.0.1",
-    "@typescript-eslint/eslint-plugin": "^4.28.3",
-    "@typescript-eslint/parser": "^4.28.3",
+    "@typescript-eslint/eslint-plugin": "^4.31.2",
+    "@typescript-eslint/parser": "^4.31.2",
     "arangojs": "^7.5.0",
     "cross-env": "^7.0.3",
-    "eslint": "^7.30.0",
+    "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
-    "husky": "^7.0.0",
-    "jest": "^27.0.6",
+    "husky": "^7.0.2",
+    "jest": "^27.2.1",
     "kafkajs": "^1.15.0",
-    "lint-staged": "^10.5.4",
-    "neo4j-driver": "^4.3.1",
+    "lint-staged": "^11.1.2",
+    "neo4j-driver": "^4.3.3",
     "node-fetch": "^2.6.1",
-    "pg": "^8.6.0",
-    "prettier": "^2.3.2",
+    "pg": "^8.7.1",
+    "prettier": "^2.4.1",
     "rimraf": "^3.0.2",
-    "ts-jest": "^27.0.3",
-    "ts-node": "^10.1.0",
+    "ts-jest": "^27.0.5",
+    "ts-node": "^10.2.1",
     "typescript": "^4.3.5",
     "wait-for-expect": "^3.0.2"
   },