testcontainers 8.13.1-beta.2 → 8.13.1-beta.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -35,7 +35,7 @@ const getDockerClient = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
35
35
|
// if (await isDockerDaemonReachable(dockerode)) {
|
|
36
36
|
const host = yield resolveHost(dockerode, uri);
|
|
37
37
|
logger_1.log.info(`Using Docker client strategy: ${strategy.getName()}, Docker host: ${host}`);
|
|
38
|
-
(0, log_system_diagnostics_1.logSystemDiagnostics)();
|
|
38
|
+
(0, log_system_diagnostics_1.logSystemDiagnostics)(dockerode);
|
|
39
39
|
return { host, dockerode };
|
|
40
40
|
// } else {
|
|
41
41
|
// log.warn(`Docker client strategy ${strategy.getName()} is not reachable`);
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import Dockerode from "dockerode";
|
|
1
2
|
declare type DockerInfo = {
|
|
2
3
|
serverVersion: number;
|
|
3
4
|
operatingSystem: string;
|
|
@@ -6,5 +7,5 @@ declare type DockerInfo = {
|
|
|
6
7
|
cpus: number;
|
|
7
8
|
memory: number;
|
|
8
9
|
};
|
|
9
|
-
export declare const getDockerInfo: () => Promise<DockerInfo>;
|
|
10
|
+
export declare const getDockerInfo: (dockerode: Dockerode) => Promise<DockerInfo>;
|
|
10
11
|
export {};
|
|
@@ -10,9 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.getDockerInfo = void 0;
|
|
13
|
-
const
|
|
14
|
-
const getDockerInfo = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
15
|
-
const { dockerode } = yield (0, docker_client_1.dockerClient)();
|
|
13
|
+
const getDockerInfo = (dockerode) => __awaiter(void 0, void 0, void 0, function* () {
|
|
16
14
|
const info = yield dockerode.info();
|
|
17
15
|
return {
|
|
18
16
|
serverVersion: info.ServerVersion,
|
|
@@ -1 +1,2 @@
|
|
|
1
|
-
|
|
1
|
+
import Dockerode from "dockerode";
|
|
2
|
+
export declare const logSystemDiagnostics: (dockerode: Dockerode) => Promise<void>;
|
|
@@ -13,11 +13,11 @@ exports.logSystemDiagnostics = void 0;
|
|
|
13
13
|
const logger_1 = require("./logger");
|
|
14
14
|
const docker_compose_1 = require("./docker-compose/docker-compose");
|
|
15
15
|
const get_info_1 = require("./docker/functions/get-info");
|
|
16
|
-
const logSystemDiagnostics = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
16
|
+
const logSystemDiagnostics = (dockerode) => __awaiter(void 0, void 0, void 0, function* () {
|
|
17
17
|
logger_1.log.debug("Fetching system diagnostics");
|
|
18
18
|
const info = {
|
|
19
19
|
node: getNodeInfo(),
|
|
20
|
-
docker: yield (0, get_info_1.getDockerInfo)(),
|
|
20
|
+
docker: yield (0, get_info_1.getDockerInfo)(dockerode),
|
|
21
21
|
dockerCompose: yield getDockerComposeInfo(),
|
|
22
22
|
};
|
|
23
23
|
logger_1.log.debug(`System diagnostics: ${JSON.stringify(info)}`);
|