Skip to content

Commit c97e35d

Browse files
Don't log compose version (#1012)
Now that we have dropped support for compose v1 this isn't necessary
1 parent 7f0501c commit c97e35d

File tree

3 files changed

+6
-16
lines changed

3 files changed

+6
-16
lines changed

packages/testcontainers/src/container-runtime/clients/client.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { DockerImageClient } from "./image/docker-image-client";
1717
import { ImageClient } from "./image/image-client";
1818
import { DockerNetworkClient } from "./network/docker-network-client";
1919
import { NetworkClient } from "./network/network-client";
20-
import { ComposeInfo, ContainerRuntimeInfo, Info, NodeInfo } from "./types";
20+
import { ContainerRuntimeInfo, Info, NodeInfo } from "./types";
2121

2222
export class ContainerRuntimeClient {
2323
constructor(
@@ -123,9 +123,7 @@ async function initStrategy(strategy: ContainerRuntimeClientStrategy): Promise<C
123123
labels: dockerodeInfo.Labels ? dockerodeInfo.Labels : [],
124124
};
125125

126-
const composeInfo: ComposeInfo = composeClient.version;
127-
128-
const info: Info = { node: nodeInfo, containerRuntime: containerRuntimeInfo, compose: composeInfo };
126+
const info: Info = { node: nodeInfo, containerRuntime: containerRuntimeInfo };
129127

130128
log.trace(`Container runtime info:\n${JSON.stringify(info, null, 2)}`);
131129
return new ContainerRuntimeClient(info, composeClient, containerClient, imageClient, networkClient);

packages/testcontainers/src/container-runtime/clients/compose/compose-client.ts

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { defaultComposeOptions } from "./default-compose-options";
44
import { ComposeDownOptions, ComposeOptions } from "./types";
55

66
export interface ComposeClient {
7-
version: string;
87
up(options: ComposeOptions, services?: Array<string>): Promise<void>;
98
pull(options: ComposeOptions, services?: Array<string>): Promise<void>;
109
stop(options: ComposeOptions): Promise<void>;
@@ -13,18 +12,14 @@ export interface ComposeClient {
1312

1413
export async function getComposeClient(environment: NodeJS.ProcessEnv): Promise<ComposeClient> {
1514
try {
16-
const version = (await compose.version()).data.version;
17-
return new DockerComposeClient(version, environment);
15+
return new DockerComposeClient(environment);
1816
} catch (err) {
19-
return new MissingComposeClient("N/A");
17+
return new MissingComposeClient();
2018
}
2119
}
2220

2321
class DockerComposeClient implements ComposeClient {
24-
constructor(
25-
public readonly version: string,
26-
private readonly environment: NodeJS.ProcessEnv
27-
) {}
22+
constructor(private readonly environment: NodeJS.ProcessEnv) {}
2823

2924
async up(options: ComposeOptions, services: Array<string> | undefined): Promise<void> {
3025
try {
@@ -94,7 +89,7 @@ class DockerComposeClient implements ComposeClient {
9489
}
9590

9691
class MissingComposeClient implements ComposeClient {
97-
constructor(public readonly version: string) {}
92+
constructor() {}
9893

9994
up(): Promise<void> {
10095
throw new Error("Compose is not installed");

packages/testcontainers/src/container-runtime/clients/types.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
export type Info = {
22
node: NodeInfo;
33
containerRuntime: ContainerRuntimeInfo;
4-
compose: ComposeInfo;
54
};
65

76
export type NodeInfo = {
@@ -25,6 +24,4 @@ export type ContainerRuntimeInfo = {
2524
labels: string[];
2625
};
2726

28-
export type ComposeInfo = string;
29-
3027
export type HostIp = { address: string; family: number };

0 commit comments

Comments
 (0)