From 9ff3a830d994209efd2970eacf89d834b54fd1c7 Mon Sep 17 00:00:00 2001 From: Fu Zi Xiang Date: Thu, 12 Oct 2023 23:39:58 +0800 Subject: [PATCH 1/2] feat: use pgadmin as recommended from official --- docker-compose-dev.yml | 1 - docker-compose.yml | 1 - nginx/nginx.conf | 3 +++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index ae0f5423..84cf109c 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -30,7 +30,6 @@ services: environment: - PGADMIN_DEFAULT_EMAIL=${PGADMIN_DEFAULT_EMAIL} - PGADMIN_DEFAULT_PASSWORD=${PGADMIN_DEFAULT_PASSWORD} - - PGADMIN_CONFIG_WTF_CSRF_ENABLED=False ports: - 5400:80 diff --git a/docker-compose.yml b/docker-compose.yml index 287c5298..cca4a1fc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -44,7 +44,6 @@ services: environment: - PGADMIN_DEFAULT_EMAIL=${PGADMIN_DEFAULT_EMAIL} - PGADMIN_DEFAULT_PASSWORD=${PGADMIN_DEFAULT_PASSWORD} - - PGADMIN_CONFIG_WTF_CSRF_ENABLED=False ports: - 5400:80 diff --git a/nginx/nginx.conf b/nginx/nginx.conf index d01a8c4e..dcf0a209 100644 --- a/nginx/nginx.conf +++ b/nginx/nginx.conf @@ -41,7 +41,10 @@ http { # PgAdmin location /pgadmin/ { proxy_set_header X-Script-Name /pgadmin; + proxy_set_header X-Scheme $scheme; + proxy_set_header Host $host; proxy_pass http://pgadmin:80/; + proxy_redirect off; } # Admin Frontend From 99bd0a8689d621a860c6504ffb7395ab895415d4 Mon Sep 17 00:00:00 2001 From: Fu Zi Xiang Date: Thu, 12 Oct 2023 23:49:45 +0800 Subject: [PATCH 2/2] feat: use volume mounting to set initial servers --- docker-compose-dev.yml | 6 +++--- docker-compose.yml | 6 +++--- docker/pgadmin.Dockerfile | 11 ----------- docker/pgadmin/custom_entrypoint.sh | 10 ---------- 4 files changed, 6 insertions(+), 27 deletions(-) delete mode 100644 docker/pgadmin.Dockerfile delete mode 100755 docker/pgadmin/custom_entrypoint.sh diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 84cf109c..1a9ca229 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -22,9 +22,7 @@ services: - ./migrations/before:/docker-entrypoint-initdb.d pgadmin: - build: - context: . - dockerfile: docker/pgadmin.Dockerfile + image: dpage/pgadmin4 depends_on: - postgres environment: @@ -32,6 +30,8 @@ services: - PGADMIN_DEFAULT_PASSWORD=${PGADMIN_DEFAULT_PASSWORD} ports: - 5400:80 + volumes: + - ./docker/pgadmin/servers.json:/pgadmin4/servers.json redis: image: redis diff --git a/docker-compose.yml b/docker-compose.yml index cca4a1fc..b4f8f206 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -36,9 +36,7 @@ services: - ./migrations/before:/docker-entrypoint-initdb.d pgadmin: - build: - context: . - dockerfile: docker/pgadmin.Dockerfile + image: dpage/pgadmin4 depends_on: - postgres environment: @@ -46,6 +44,8 @@ services: - PGADMIN_DEFAULT_PASSWORD=${PGADMIN_DEFAULT_PASSWORD} ports: - 5400:80 + volumes: + - ./docker/pgadmin/servers.json:/pgadmin4/servers.json redis: image: redis diff --git a/docker/pgadmin.Dockerfile b/docker/pgadmin.Dockerfile deleted file mode 100644 index 9e124dd0..00000000 --- a/docker/pgadmin.Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM dpage/pgadmin4 - -COPY ./docker/pgadmin/servers.json /pgadmin4/servers.json -COPY ./docker/pgadmin/custom_entrypoint.sh /custom_entrypoint.sh - -USER root -RUN chmod +x /custom_entrypoint.sh - -USER pgadmin - -ENTRYPOINT ["/custom_entrypoint.sh"] diff --git a/docker/pgadmin/custom_entrypoint.sh b/docker/pgadmin/custom_entrypoint.sh deleted file mode 100755 index 8cd3dfab..00000000 --- a/docker/pgadmin/custom_entrypoint.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# Call the original entrypoint -/entrypoint.sh "$@" - -# Your additional commands to invoke setup.py (example below, adjust accordingly) -python setup.py --load-servers /path/to/your/servers.json - -# Keep container running -tail -f /dev/null