From 4bc349b596f45f47b0802049c86ebcc0723a85fd Mon Sep 17 00:00:00 2001
From: Zaiming Shi <zmstone@gmail.com>
Date: Mon, 26 Apr 2021 10:49:14 +0200
Subject: [PATCH] chore: move docker env var from Dockerfile to entrypoints

---
 deploy/docker/Dockerfile           | 6 ------
 deploy/docker/docker-entrypoint.sh | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/deploy/docker/Dockerfile b/deploy/docker/Dockerfile
index e54eb91cd..f7bfed3b0 100644
--- a/deploy/docker/Dockerfile
+++ b/deploy/docker/Dockerfile
@@ -78,10 +78,4 @@ EXPOSE 1883 8081 8083 8084 8883 11883 18083 4369 4370 5369 6369 6370
 
 ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"]
 
-# The default rpc port discovery 'stateless' is mostly for clusters
-# having static node names. So it's troulbe-free for multiple emqx nodes
-# running on the same host.
-# When start emqx in docker, it's mostly one emqx node in one container
-ENV EMQX_RPC__PORT_DISCOVERY=manual
-
 CMD ["/opt/emqx/bin/emqx", "foreground"]
diff --git a/deploy/docker/docker-entrypoint.sh b/deploy/docker/docker-entrypoint.sh
index 91e474818..a95aa50ee 100755
--- a/deploy/docker/docker-entrypoint.sh
+++ b/deploy/docker/docker-entrypoint.sh
@@ -129,4 +129,10 @@ if [[ -n "$EMQX_LOADED_MODULES" ]]; then
     fill_tuples "$LOADED_MODULES" "$EMQX_LOADED_MODULES"
 fi
 
+# The default rpc port discovery 'stateless' is mostly for clusters
+# having static node names. So it's troulbe-free for multiple emqx nodes
+# running on the same host.
+# When start emqx in docker, it's mostly one emqx node in one container
+export EMQX_RPC__PORT_DISCOVERY="${EMQX_RPC__PORT_DISCOVERY:-manual}"
+
 exec "$@"