From bba6f8b9a5ad7c7758827a5b6109d4916f0c4cc0 Mon Sep 17 00:00:00 2001 From: NagyZoltanPeter <113987313+NagyZoltanPeter@users.noreply.github.com> Date: Thu, 9 May 2024 11:15:57 +0200 Subject: [PATCH] Comment pgadmin support to enable older version of docker-compose to run (#91) --- docker-compose.yml | 82 ++++++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 40 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index e895e79..7c4017c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -142,45 +142,47 @@ services: depends_on: - postgres - pgadmin: - image: dpage/pgadmin4:latest - environment: - - PGADMIN_DEFAULT_EMAIL=waku@waku.com - - PGADMIN_DEFAULT_PASSWORD=wakuwaku - - PGADMIN_CONFIG_SERVER_MODE=False - - PGADMIN_CONFIG_MASTER_PASSWORD_REQUIRED=False - - PGADMIN_LISTEN_PORT=80 - ports: - - 15432:80 - user: root - entrypoint: /bin/sh -c "chmod 600 /pgpass; /entrypoint.sh;" - volumes: - - pgadmin:/var/lib/pgadmin - configs: - - source: servers.json - target: /pgadmin4/servers.json - - source: pgpass - target: /pgpass - depends_on: - - postgres - profiles: - - dbadmin +## Remove comment if you need pgadmin support in your container. +## Commented for backward version compatibility of docker-compose. +# pgadmin: +# image: dpage/pgadmin4:latest +# environment: +# - PGADMIN_DEFAULT_EMAIL=waku@waku.com +# - PGADMIN_DEFAULT_PASSWORD=wakuwaku +# - PGADMIN_CONFIG_SERVER_MODE=False +# - PGADMIN_CONFIG_MASTER_PASSWORD_REQUIRED=False +# - PGADMIN_LISTEN_PORT=80 +# ports: +# - 15432:80 +# user: root +# entrypoint: /bin/sh -c "chmod 600 /pgpass; /entrypoint.sh;" +# volumes: +# - pgadmin:/var/lib/pgadmin +# configs: +# - source: servers.json +# target: /pgadmin4/servers.json +# - source: pgpass +# target: /pgpass +# depends_on: +# - postgres +# profiles: +# - dbadmin -volumes: - pgadmin: +# volumes: +# pgadmin: -configs: - pgpass: - content: postgres:5432:*:${POSTGRES_USER:-postgres}:${POSTGRES_PASSWORD:-test123} - servers.json: - content: | - {"Servers": {"1": { - "Group": "Servers", - "Name": "WakuStoreDB", - "Host": "postgres", - "Port": 5432, - "MaintenanceDB": "postgres", - "Username": "postgres", - "PassFile": "/pgpass", - "SSLMode": "disable" - }}} \ No newline at end of file +# configs: +# pgpass: +# content: postgres:5432:*:${POSTGRES_USER:-postgres}:${POSTGRES_PASSWORD:-test123} +# servers.json: +# content: | +# {"Servers": {"1": { +# "Group": "Servers", +# "Name": "WakuStoreDB", +# "Host": "postgres", +# "Port": 5432, +# "MaintenanceDB": "postgres", +# "Username": "postgres", +# "PassFile": "/pgpass", +# "SSLMode": "disable" +# }}} \ No newline at end of file