From de36f28913fa0621e47dc7e5504080bdc3d42457 Mon Sep 17 00:00:00 2001 From: djerom Date: Mon, 29 Dec 2025 14:04:55 -0800 Subject: [PATCH] =?UTF-8?q?feat:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20pgadmin=20=D1=81=20=D0=BF=D0=B0=D1=80=D0=B0?= =?UTF-8?q?=D0=BC=D0=B5=D1=82=D1=80=D0=B0=D0=BC=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .example.env | 4 +++- dev/docker-compose.yml | 25 +++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/.example.env b/.example.env index 81459b1..0565c76 100644 --- a/.example.env +++ b/.example.env @@ -5,4 +5,6 @@ REG=git.sys.smsynergy.ru REG_USER= REG_PASS= -# --- Databases \ No newline at end of file +# --- Databases +# PGADMIN_DEFAULT_EMAIL=pgadmin@mail.${DOMAIN} # +# PGADMIN_DEFAULT_PASSWORD= \ No newline at end of file diff --git a/dev/docker-compose.yml b/dev/docker-compose.yml index 432f697..20932ab 100644 --- a/dev/docker-compose.yml +++ b/dev/docker-compose.yml @@ -52,6 +52,7 @@ services: image: ${REG}/cc/sah:0.0.3 volumes: - ./sah/data:/data + - ./sah/logs:/logs environment: - COOKIE_DOMAIN=${DOMAIN} - SAH_DOMAIN=sah.${DOMAIN} @@ -129,6 +130,30 @@ services: - traefik.http.routers.mongoadmin.rule=Host(`mongoadmin.${DOMAIN}`) - traefik.http.services.mongoadmin.loadbalancer.server.port=8081 + # db-sql: + # image: ${REG2}/cc/rt/sql:9.6.3 + # environment: + # - POSTGRES_PASSWORD=mysecretpassword + # - LANG=ru_RU.UTF-8 + # restart: always + # volumes: + # - "/srv/db/db-sql/data:/var/lib/postgresql/data" + # labels: + # - traefik.enable=false + + pgadmin: + image: dpage/pgadmin4:4.30 + restart: always + volumes: + - ./pgadmin:/var/lib/pgadmin # Критически важно для сохранения данных + environment: + - PGADMIN_DEFAULT_EMAIL=${PGADMIN_DEFAULT_EMAIL:-pgadmin@mail.${DOMAIN}} + - PGADMIN_DEFAULT_PASSWORD=${PGADMIN_DEFAULT_PASSWORD} + - PGADMIN_CONFIG_WTF_CSRF_ENABLED=0 + - PGADMIN_CONFIG_ENHANCED_COOKIE_PROTECTION=0 + labels: + - traefik.http.routers.pgadmin.rule=Host(`pgadmin.${DOMAIN}`) + # --- Application services --- app: