Changed image to bitnami/pgbouncer

kisztof · Aug 22, 2023 · 73f6bb5 · 73f6bb5
1 parent c2531b4
commit 73f6bb5
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/.github/workflows/pgbouncer_postgresql.yml b/.github/workflows/pgbouncer_postgresql.yml
@@ -48,7 +48,7 @@ jobs:
           sudo apt-get install -y postgresql-client
           docker-compose ps # Lists the status of all services
           count=0
-          until PGPASSWORD=password psql -h pgbouncer -p 6432 -U pgbouncer -d pgbouncer -c 'SHOW STATS;' || [[ $count -eq 15 ]]; do
+          until PGPASSWORD=password psql -h localhost -p 6432 -U username -d postgres -c 'SHOW STATS;' || [[ $count -eq 15 ]]; do
             sleep 2
             count=$((count + 1))
           done

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -7,8 +7,19 @@ services:
       POSTGRES_PASSWORD: password
 
   pgbouncer:
-    build: ./pgbouncer
+    image: bitnami/pgbouncer
+    environment:
+      POSTGRESQL_HOST: postgres
+      POSTGRESQL_USERNAME: username
+      POSTGRESQL_PASSWORD: password
+      POSTGRESQL_DATABASE: postgres
+      PGBOUNCER_POOL_MODE: transaction
+      PGBOUNCER_PORT: 6432
     ports:
       - "6432:6432"
     depends_on:
       - postgres
+    volumes:
+      - ./pgbouncer/pgbouncer.ini:/etc/pgbouncer/pgbouncer.ini
+      - ./pgbouncer/userlist.txt:/etc/pgbouncer/userlist.txt
+
diff --git a/pgbouncer/Dockerfile b/pgbouncer/Dockerfile
diff --git a/pgbouncer/pgbouncer.ini b/pgbouncer/pgbouncer.ini
@@ -2,7 +2,7 @@
 * = host=postgres port=5432
 
 [pgbouncer]
-listen_addr = *
 listen_port = 6432
 auth_type = md5
 auth_file = /etc/pgbouncer/userlist.txt
+admin_users = username
diff --git a/pgbouncer/userlist.txt b/pgbouncer/userlist.txt
@@ -1 +1 @@
-"username" "password"
+"username" "5a231fcdb710d73268c4f44283487ba2"