Commit 0d4063c8 authored by Jacob Priddy's avatar Jacob Priddy 👌
Browse files

Merge branch '75-use-pgadmin-instead-of-phppgadmin-cause-it-looks-cooler' into 'master'

Resolve "Use pgadmin instead of phppgadmin cause it looks cooler"

Closes #75

See merge request !61
parents 1f376e6d 8d37537c
Pipeline #10010 passed with stages
in 2 minutes and 56 seconds
......@@ -14,6 +14,7 @@ secrets:
volumes:
db-data:
pgadmin-data:
services:
webserver:
......@@ -43,7 +44,7 @@ services:
networks:
- doorcode
postgres:
image: postgres:11-alpine
image: postgres:13-alpine
container_name: postgres
restart: unless-stopped
tty: true
......@@ -58,7 +59,7 @@ services:
networks:
- doorcode
dbadmin:
image: dockage/phppgadmin:latest
image: dpage/pgadmin4:latest
container_name: dbadmin
restart: unless-stopped
tty: true
......@@ -66,10 +67,11 @@ services:
- "8081:80"
depends_on:
- postgres
volumes:
- pgadmin-data:/var/lib/pgadmin
environment:
PHP_PG_ADMIN_SERVER_HOST: postgres
PHP_PG_ADMIN_SERVER_DEFAULT_DB: doorcode
PHP_PG_ADMIN_SERVER_PORT: 5432
PGADMIN_DEFAULT_EMAIL: admin@elock
PGADMIN_DEFAULT_PASSWORD: secret
networks:
- doorcode
api:
......
......@@ -16,6 +16,7 @@ secrets:
volumes:
db-data:
pgadmin-data:
services:
webserver:
......@@ -45,7 +46,7 @@ services:
networks:
- doorcode
postgres:
image: postgres:11.8-alpine
image: postgres:13-alpine
container_name: postgres
restart: always
secrets:
......@@ -61,17 +62,16 @@ services:
networks:
- doorcode
dbadmin:
image: dockage/phppgadmin:latest
image: dpage/pgadmin4:4.21
container_name: dbadmin
restart: always
ports:
- "127.0.0.1:5431:80"
depends_on:
- postgres
volumes:
- pgadmin-data:/var/lib/pgadmin
environment:
PHP_PG_ADMIN_SERVER_HOST: postgres
PHP_PG_ADMIN_SERVER_DEFAULT_DB: doorcode
PHP_PG_ADMIN_SERVER_PORT: 5432
PGADMIN_DEFAULT_EMAIL: admin@elock
PGADMIN_DEFAULT_PASSWORD: Please change the default password.
networks:
- doorcode
api:
......
......@@ -62,6 +62,14 @@ server {
}
}
location /pgadmin4 {
proxy_set_header X-Script-Name /pgadmin4/;
proxy_set_header X-Scheme $scheme;
proxy_set_header Host $http_host;
proxy_pass http://dbadmin/;
proxy_redirect off;
}
location /api {
proxy_pass https://localhost.api;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment