From 59fdfc3728fa950fa022341b6960d6094339d731 Mon Sep 17 00:00:00 2001
From: crazywoola <100913391+crazywoola@users.noreply.github.com>
Date: Wed, 18 Jun 2025 16:03:32 +0800
Subject: [PATCH] fix: remove redundant PG_USER (#21162)

---
 docker/.env.example                 | 1 -
 docker/docker-compose-template.yaml | 1 -
 docker/docker-compose.yaml          | 2 --
 docker/middleware.env.example       | 2 +-
 4 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/docker/.env.example b/docker/.env.example
index 6df926a71..020deb688 100644
--- a/docker/.env.example
+++ b/docker/.env.example
@@ -815,7 +815,6 @@ TEXT_GENERATION_TIMEOUT_MS=60000
 # Environment Variables for db Service
 # ------------------------------
 
-PGUSER=${DB_USERNAME}
 # The name of the default postgres user.
 POSTGRES_USER=${DB_USERNAME}
 # The password for the default postgres user.
diff --git a/docker/docker-compose-template.yaml b/docker/docker-compose-template.yaml
index 57c9d37f0..9534d8ef7 100644
--- a/docker/docker-compose-template.yaml
+++ b/docker/docker-compose-template.yaml
@@ -84,7 +84,6 @@ services:
     image: postgres:15-alpine
     restart: always
     environment:
-      PGUSER: ${PGUSER:-postgres}
       POSTGRES_USER: ${POSTGRES_USER:-postgres}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-difyai123456}
       POSTGRES_DB: ${POSTGRES_DB:-dify}
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index e4f1d4a1d..b0f274c29 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -356,7 +356,6 @@ x-shared-env: &shared-api-worker-env
   MAX_PARALLEL_LIMIT: ${MAX_PARALLEL_LIMIT:-10}
   MAX_ITERATIONS_NUM: ${MAX_ITERATIONS_NUM:-99}
   TEXT_GENERATION_TIMEOUT_MS: ${TEXT_GENERATION_TIMEOUT_MS:-60000}
-  PGUSER: ${PGUSER:-${DB_USERNAME}}
   POSTGRES_USER: ${POSTGRES_USER:-${DB_USERNAME}}
   POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-${DB_PASSWORD}}
   POSTGRES_DB: ${POSTGRES_DB:-${DB_DATABASE}}
@@ -592,7 +591,6 @@ services:
     image: postgres:15-alpine
     restart: always
     environment:
-      PGUSER: ${PGUSER:-postgres}
       POSTGRES_USER: ${POSTGRES_USER:-postgres}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-difyai123456}
       POSTGRES_DB: ${POSTGRES_DB:-dify}
diff --git a/docker/middleware.env.example b/docker/middleware.env.example
index f261d88d4..2eba62f59 100644
--- a/docker/middleware.env.example
+++ b/docker/middleware.env.example
@@ -1,7 +1,7 @@
 # ------------------------------
 # Environment Variables for db Service
 # ------------------------------
-PGUSER=postgres
+POSTGRES_USER=postgres
 # The password for the default postgres user.
 POSTGRES_PASSWORD=difyai123456
 # The name of the default postgres database.