Use pg_isready as healthcheck

Author: cristianrgreco

docs/features/wait-strategies.md

@@ -256,14 +256,3 @@ const container = await new GenericContainer("alpine")
   .withWaitStrategy(new ReadyAfterDelayWaitStrategy())
   .start();
 ```
-
-## Restart wait strategies
-
-The default wait strategy used when a container restarts is the same as the one used when it starts. However sometimes a container behaves differently between its first start and subsequent starts. Postgres is one such example. For this reason you can specify a wait strategy specifically used for restarts:
-
-```javascript
-const container = await new GenericContainer("postgres")
-  .withWaitStrategy(Wait.forLogMessage(/.*database system is ready to accept connections.*/, 2))
-  .withRestartWaitStrategy(Wait.forLogMessage(/.*database system is ready to accept connections.*/, 1))
-  .start();
-```

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

@@ -10,12 +10,7 @@ export class PostgreSqlContainer extends GenericContainer {
   constructor(image = "postgres:13.3-alpine") {
     super(image);
     this.withExposedPorts(POSTGRES_PORT);
-    this.withWaitStrategy(
-      Wait.forAll([Wait.forHealthCheck(), Wait.forLogMessage(/.*database system is ready to accept connections.*/, 2)])
-    );
-    this.withRestartWaitStrategy(
-      Wait.forAll([Wait.forHealthCheck(), Wait.forLogMessage(/.*database system is ready to accept connections.*/, 1)])
-    );
+    this.withWaitStrategy(Wait.forHealthCheck());
     this.withStartupTimeout(120_000);
   }
 
@@ -42,7 +37,10 @@ export class PostgreSqlContainer extends GenericContainer {
     });
     if (!this.healthCheck) {
       this.withHealthCheck({
-        test: ["CMD-SHELL", `PGPASSWORD=${this.password} psql -U ${this.username} -d ${this.database} -c 'SELECT 1;'`],
+        test: [
+          "CMD-SHELL",
+          `PGPASSWORD=${this.password} pg_isready --host localhost --username ${this.username} --dbname ${this.database}`,
+        ],
         interval: 250,
         timeout: 1000,
         retries: 1000,

packages/testcontainers/src/generic-container/generic-container.ts

@@ -48,7 +48,6 @@ export class GenericContainer implements TestContainer {
   protected imageName: ImageName;
   protected startupTimeout?: number;
   protected waitStrategy: WaitStrategy = Wait.forListeningPorts();
-  protected restartWaitStrategy?: WaitStrategy;
   protected environment: Record<string, string> = {};
   protected exposedPorts: PortWithOptionalBinding[] = [];
   protected reuse = false;
@@ -162,7 +161,7 @@ export class GenericContainer implements TestContainer {
       inspectResult,
       boundPorts,
       inspectResult.Name,
-      this.restartWaitStrategy ?? this.waitStrategy,
+      this.waitStrategy,
       this.autoRemove
     );
   }
@@ -231,7 +230,7 @@ export class GenericContainer implements TestContainer {
       inspectResult,
       boundPorts,
       inspectResult.Name,
-      this.restartWaitStrategy ?? this.waitStrategy,
+      this.waitStrategy,
       this.autoRemove
     );
 
@@ -420,11 +419,6 @@ export class GenericContainer implements TestContainer {
     return this;
   }
 
-  public withRestartWaitStrategy(waitStrategy: WaitStrategy): this {
-    this.restartWaitStrategy = waitStrategy;
-    return this;
-  }
-
   public withDefaultLogDriver(): this {
     this.hostConfig.LogConfig = {
       Type: "json-file",

packages/testcontainers/src/generic-container/started-generic-container.ts

@@ -24,7 +24,7 @@ export class StartedGenericContainer implements StartedTestContainer {
     private inspectResult: ContainerInspectInfo,
     private boundPorts: BoundPorts,
     private readonly name: string,
-    private readonly restartWaitStrategy: WaitStrategy,
+    private readonly waitStrategy: WaitStrategy,
     private readonly autoRemove: boolean
   ) {}
 
@@ -94,7 +94,7 @@ export class StartedGenericContainer implements StartedTestContainer {
       Array.from(this.boundPorts.iterator()).map((port) => port[0])
     );
 
-    await waitForContainer(client, this.container, this.restartWaitStrategy, this.boundPorts, startTime);
+    await waitForContainer(client, this.container, this.waitStrategy, this.boundPorts, startTime);
     log.info(`Restarted container`, { containerId: this.container.id });
   }
 

packages/testcontainers/src/test-container.ts

@@ -32,7 +32,6 @@ export interface TestContainer {
   withExposedPorts(...ports: PortWithOptionalBinding[]): this;
   withBindMounts(bindMounts: BindMount[]): this;
   withWaitStrategy(waitStrategy: WaitStrategy): this;
-  withRestartWaitStrategy(waitStrategy: WaitStrategy): this;
   withStartupTimeout(startupTimeoutMs: number): this;
   withNetwork(network: StartedNetwork): this;
   withNetworkMode(networkMode: string): this;