feat: Init pg bouncer/cron locally and in test

near · Apr 2, 2024 · 03ee9a1 · 03ee9a1
1 parent f09776d
commit 03ee9a1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -79,10 +79,10 @@ services:
       - "6379:6379"
 
   postgres:
-    image: postgres:14
+    build:
+      context: ./postgres
     restart: always
     volumes:
-    - ./init-scripts/postgres:/docker-entrypoint-initdb.d
     - postgres:/var/lib/postgresql/data
     environment:
       POSTGRES_PASSWORD: postgrespassword

diff --git a/postgres.Dockerfile → postgres/Dockerfile b/postgres.Dockerfile → postgres/Dockerfile
@@ -4,7 +4,7 @@ RUN apt-get update && apt-get install -y postgresql-14-cron
 
 RUN echo "shared_preload_libraries = 'pg_cron'" >> /usr/share/postgresql/postgresql.conf.sample
 
-RUN echo "CREATE EXTENSION pg_cron;" > /docker-entrypoint-initdb.d/init-pg-cron.sql
+COPY ./init.sql /docker-entrypoint-initdb.d/
 
 EXPOSE 5432
 

diff --git a/init-scripts/postgres/init.sql → postgres/init.sql b/init-scripts/postgres/init.sql → postgres/init.sql
@@ -1,3 +1,4 @@
+-- pgbouncer
 CREATE ROLE pgbouncer LOGIN;
 ALTER ROLE pgbouncer WITH PASSWORD 'pgbouncer';
 CREATE OR REPLACE FUNCTION public.user_lookup(in i_username text, out uname text, out phash text)
@@ -10,3 +11,6 @@ END;
 $$ LANGUAGE plpgsql SECURITY DEFINER;
 REVOKE ALL ON FUNCTION public.user_lookup(text) FROM public;
 GRANT EXECUTE ON FUNCTION public.user_lookup(text) TO pgbouncer;
+
+-- pg_cron
+CREATE EXTENSION pg_cron;
diff --git a/runner/tests/testcontainers/postgres.ts b/runner/tests/testcontainers/postgres.ts
@@ -17,7 +17,7 @@ export class PostgreSqlContainer {
   }
 
   public static async build (): Promise<PostgreSqlContainer> {
-    const container = await GenericContainer.fromDockerfile('../', 'postgres.Dockerfile').build();
+    const container = await GenericContainer.fromDockerfile('../postgres').build();
 
     return new PostgreSqlContainer(container);
   }