From 4c264b53a54482f6c1edfe2862ae3f138d5ded85 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 14 Nov 2025 14:26:23 +0000
Subject: [PATCH] Ensure BACK_PORT and GRPC_PORT survive pm2 reload with
 --update-env

Co-authored-by: whyour <22700758+whyour@users.noreply.github.com>
---
 docker/docker-entrypoint.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index 2f5df3f4..7411a013 100755
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -2,7 +2,6 @@
 
 dir_shell=/ql/shell
 . $dir_shell/share.sh
-. $dir_shell/env.sh
 
 log_with_style() {
   local level="$1"
@@ -18,6 +17,10 @@ import_config "$@"
 export BACK_PORT="${ql_port}"
 # Export GRPC_PORT from QlGrpcPort for gRPC server to use
 export GRPC_PORT="${ql_grpc_port}"
+
+# Source env.sh after exporting BACK_PORT and GRPC_PORT so they are captured
+. $dir_shell/env.sh
+
 fix_config
 
 pm2 l &>/dev/null