Fixes for docker-compose

Author: cristianrgreco

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

@@ -123,7 +123,7 @@ async function initStrategy(strategy: ContainerRuntimeClientStrategy): Promise<C
     labels: dockerodeInfo.Labels ? dockerodeInfo.Labels : [],
   };
 
-  const composeInfo: ComposeInfo = composeClient.info;
+  const composeInfo: ComposeInfo = composeClient.version;
 
   const info: Info = { node: nodeInfo, containerRuntime: containerRuntimeInfo, compose: composeInfo };
 

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

@@ -4,6 +4,7 @@ import { defaultComposeOptions } from "./default-compose-options";
 import { ComposeDownOptions, ComposeOptions } from "./types";
 
 export interface ComposeClient {
+  version: string;
   up(options: ComposeOptions, services?: Array<string>): Promise<void>;
   pull(options: ComposeOptions, services?: Array<string>): Promise<void>;
   stop(options: ComposeOptions): Promise<void>;
@@ -12,15 +13,18 @@ export interface ComposeClient {
 
 export async function getComposeClient(environment: NodeJS.ProcessEnv): Promise<ComposeClient> {
   try {
-    await compose.version();
-    return new DockerComposeClient(environment);
+    const version = (await compose.version()).data.version;
+    return new DockerComposeClient(version, environment);
   } catch (err) {
-    return new MissingComposeClient();
+    return new MissingComposeClient("N/A");
   }
 }
 
 class DockerComposeClient implements ComposeClient {
-  constructor(private readonly environment: NodeJS.ProcessEnv) {}
+  constructor(
+    public readonly version: string,
+    private readonly environment: NodeJS.ProcessEnv
+  ) {}
 
   async up(options: ComposeOptions, services: Array<string> | undefined): Promise<void> {
     try {
@@ -90,7 +94,7 @@ class DockerComposeClient implements ComposeClient {
 }
 
 class MissingComposeClient implements ComposeClient {
-  public readonly info = undefined;
+  constructor(public readonly version: string) {}
 
   up(): Promise<void> {
     throw new Error("Compose is not installed");

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

@@ -25,11 +25,6 @@ export type ContainerRuntimeInfo = {
   labels: string[];
 };
 
-export type ComposeInfo =
-  | {
-      version: string;
-      compatability: "v1" | "v2";
-    }
-  | undefined;
+export type ComposeInfo = string;
 
 export type HostIp = { address: string; family: number };