diff --git a/compose.yml b/compose.yml index 8515c85..a1008b7 100644 --- a/compose.yml +++ b/compose.yml @@ -15,33 +15,6 @@ services: ports: - '${DB_PORT}:5432' - pgadmin: - container_name: pgadmin - image: dpage/pgadmin4:8 - restart: always - entrypoint: /bin/sh -c "chmod 0600 /pgpass; /entrypoint.sh;" - healthcheck: - test: ['CMD', 'wget', '-O', '-', 'http://localhost:80/misc/ping'] - interval: 2s - timeout: 10s - retries: 30 - env_file: .env - environment: - - PGADMIN_DEFAULT_EMAIL=myemail@gmail.com - - PGADMIN_DEFAULT_PASSWORD=a12345678 - - PGADMIN_CONFIG_SERVER_MODE=False - - PGADMIN_CONFIG_MASTER_PASSWORD_REQUIRED=False - depends_on: - - postgres - ports: - - '5050:80' - user: root - configs: - - source: servers.json - target: /pgadmin4/servers.json - - source: pgpass - target: /pgpass - my-links: container_name: my-links restart: always @@ -61,19 +34,3 @@ services: volumes: postgres-volume: - -configs: - pgpass: - content: postgres:${DB_PORT}:*:${DB_USER}:${DB_PASSWORD} - servers.json: - content: | - {"Servers": {"1": { - "Group": "Servers", - "Name": "project", - "Host": "postgres", - "Port": ${DB_PORT}, - "MaintenanceDB": "${DB_DATABASE}", - "Username": "${DB_USER}", - "PassFile": "/pgpass", - "SSLMode": "prefer" - }}} diff --git a/dev.compose.yml b/dev.compose.yml index 9f12450..f35f55d 100644 --- a/dev.compose.yml +++ b/dev.compose.yml @@ -15,48 +15,5 @@ services: ports: - "${DB_PORT}:5432" - pgadmin: - container_name: pgadmin - image: dpage/pgadmin4:8 - restart: always - entrypoint: /bin/sh -c "chmod 0600 /pgpass; /entrypoint.sh;" - healthcheck: - test: ["CMD", "wget", "-O", "-", "http://localhost:80/misc/ping"] - interval: 2s - timeout: 10s - retries: 30 - env_file: .env - environment: - - PGADMIN_DEFAULT_EMAIL=myemail@gmail.com - - PGADMIN_DEFAULT_PASSWORD=a12345678 - - PGADMIN_CONFIG_SERVER_MODE=False - - PGADMIN_CONFIG_MASTER_PASSWORD_REQUIRED=False - depends_on: - - postgres - ports: - - "5050:80" - user: root - configs: - - source: servers.json - target: /pgadmin4/servers.json - - source: pgpass - target: /pgpass - volumes: postgres-volume: - -configs: - pgpass: - content: postgres:${DB_PORT}:*:${DB_USER}:${DB_PASSWORD} - servers.json: - content: | - {"Servers": {"1": { - "Group": "Servers", - "Name": "project", - "Host": "postgres", - "Port": ${DB_PORT}, - "MaintenanceDB": "${DB_DATABASE}", - "Username": "${DB_USER}", - "PassFile": "/pgpass", - "SSLMode": "prefer" - }}}