Use a healthcheck which runs a select 1 query

Turns out if you try to connect to PG as soon as `pg_isready` exits 0, you fail to connect. Let's change the healthcheck to run an actual query. We need to compute this later as we need credentials.

Author: cristianrgreco

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

@@ -9,15 +9,7 @@ export class PostgreSqlContainer extends GenericContainer {
 
   constructor(image = "postgres:13.3-alpine") {
     super(image);
-    this.withExposedPorts(POSTGRES_PORT)
-      .withHealthCheck({
-        test: ["CMD-SHELL", "pg_isready -U postgres"],
-        interval: 10000,
-        timeout: 5000,
-        retries: 3,
-      })
-      .withWaitStrategy(Wait.forHealthCheck())
-      .withStartupTimeout(120_000);
+    this.withExposedPorts(POSTGRES_PORT).withStartupTimeout(120_000);
   }
 
   public withDatabase(database: string): this {
@@ -41,6 +33,13 @@ export class PostgreSqlContainer extends GenericContainer {
       POSTGRES_USER: this.username,
       POSTGRES_PASSWORD: this.password,
     });
+    this.withHealthCheck({
+      test: ["CMD-SHELL", `PGPASSWORD=${this.password} psql -U ${this.username} -d ${this.database} -c 'SELECT 1;'`],
+      interval: 100,
+      timeout: 100,
+      retries: 1000,
+    });
+    this.withWaitStrategy(Wait.forHealthCheck());
     return new StartedPostgreSqlContainer(await super.start(), this.database, this.username, this.password);
   }
 }