Fix PostgreSQL container restart

Author: cristianrgreco

packages/modules/postgresql/src/postgresql-container.test.ts

@@ -83,4 +83,24 @@ describe("PostgreSqlContainer", () => {
     await container.stop();
   });
   // }
+
+  it("should work with restarted container", async () => {
+    const container = await new PostgreSqlContainer().start();
+    await container.restart();
+
+    const client = new Client({
+      host: container.getHost(),
+      port: container.getPort(),
+      database: container.getDatabase(),
+      user: container.getUsername(),
+      password: container.getPassword(),
+    });
+    await client.connect();
+
+    const result = await client.query("SELECT 1");
+    expect(result.rows[0]).toEqual({ "?column?": 1 });
+
+    await client.end();
+    await container.stop();
+  });
 });

packages/modules/postgresql/src/postgresql-container.ts

@@ -10,7 +10,13 @@ export class PostgreSqlContainer extends GenericContainer {
   constructor(image = "postgres:13.3-alpine") {
     super(image);
     this.withExposedPorts(POSTGRES_PORT)
-      .withWaitStrategy(Wait.forLogMessage(/.*database system is ready to accept connections.*/, 2))
+      .withHealthCheck({
+        test: ["CMD-SHELL", "pg_isready -U postgres"],
+        interval: 10000,
+        timeout: 5000,
+        retries: 3,
+      })
+      .withWaitStrategy(Wait.forHealthCheck())
       .withStartupTimeout(120_000);
   }
 
@@ -40,20 +46,17 @@ export class PostgreSqlContainer extends GenericContainer {
 }
 
 export class StartedPostgreSqlContainer extends AbstractStartedContainer {
-  private readonly port: number;
-
   constructor(
     startedTestContainer: StartedTestContainer,
     private readonly database: string,
     private readonly username: string,
     private readonly password: string
   ) {
     super(startedTestContainer);
-    this.port = startedTestContainer.getMappedPort(POSTGRES_PORT);
   }
 
   public getPort(): number {
-    return this.port;
+    return super.getMappedPort(POSTGRES_PORT);
   }
 
   public getDatabase(): string {

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

@@ -120,9 +120,7 @@ export class DockerContainerClient implements ContainerClient {
 
   async inspect(container: Dockerode.Container): Promise<ContainerInspectInfo> {
     try {
-      log.debug(`Inspecting container...`, { containerId: container.id });
       const inspectInfo = await container.inspect();
-      log.debug(`Inspected container`, { containerId: container.id });
       return inspectInfo;
     } catch (err) {
       log.error(`Failed to inspect container: ${err}`, { containerId: container.id });