From 72d3b2db1b497c44daf369be7c35661740ae732a Mon Sep 17 00:00:00 2001
From: Shawn <506895667@qq.com>
Date: Sat, 17 Jul 2021 14:25:07 +0800
Subject: [PATCH] fix(docker): update the env names in scripts

---
 .ci/docker-compose-file/conf.cluster.env      |  2 +-
 deploy/charts/emqx/templates/StatefulSet.yaml |  2 +-
 deploy/docker/README.md                       | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.ci/docker-compose-file/conf.cluster.env b/.ci/docker-compose-file/conf.cluster.env
index be3cc71ac..e80af9d3e 100644
--- a/.ci/docker-compose-file/conf.cluster.env
+++ b/.ci/docker-compose-file/conf.cluster.env
@@ -1,5 +1,5 @@
 EMQX_NAME=emqx
-EMQX_CLUSTER__DISCOVERY=static
+EMQX_CLUSTER__DISCOVERY_STRATEGY=static
 EMQX_CLUSTER__STATIC__SEEDS="[emqx@node1.emqx.io, emqx@node2.emqx.io]"
 EMQX_LISTENER__TCP__EXTERNAL__PROXY_PROTOCOL=on
 EMQX_LISTENER__WS__EXTERNAL__PROXY_PROTOCOL=on
diff --git a/deploy/charts/emqx/templates/StatefulSet.yaml b/deploy/charts/emqx/templates/StatefulSet.yaml
index 38006895a..410fbd09a 100644
--- a/deploy/charts/emqx/templates/StatefulSet.yaml
+++ b/deploy/charts/emqx/templates/StatefulSet.yaml
@@ -116,7 +116,7 @@ spec:
             value: {{ .Release.Name }}
           - name: EMQX_CLUSTER__K8S__APP_NAME
             value: {{ .Release.Name }}
-          - name: EMQX_CLUSTER__DISCOVERY
+          - name: EMQX_CLUSTER__DISCOVERY_STRATEGY
             value: k8s
           - name: EMQX_CLUSTER__K8S__SERVICE_NAME
             value: {{ include "emqx.fullname" . }}-headless
diff --git a/deploy/docker/README.md b/deploy/docker/README.md
index ac494b430..94ebdc7bb 100644
--- a/deploy/docker/README.md
+++ b/deploy/docker/README.md
@@ -48,8 +48,8 @@ You can change the prefix by overriding "HOCON_ENV_OVERRIDE_PREFIX".
 Example:
 
 ```bash
-EMQX_LISTENER__SSL__EXTERNAL__ACCEPTORS <--> listener.ssl.external.acceptors
-EMQX_MQTT__MAX_PACKET_SIZE              <--> mqtt.max_packet_size
+EMQX_ZONES__DEFAULT__LISTENERS__MQTT_SSL__ACCEPTORS <--> zones.default.listeners.mqtt_ssl.acceptors
+EMQX_ZONES__DEFAULT__MQTT__MAX_PACKET_SIZE <--> zones.default.mqtt.max_packet_size
 ```
 
 + Prefix ``EMQX_`` is removed
@@ -87,7 +87,7 @@ If set ``EMQX_NAME`` and ``EMQX_HOST``, and unset ``EMQX_NODE_NAME``, ``EMQX_NOD
 
 For example, set mqtt tcp port to 1883
 
-``docker run -d --name emqx -e EMQX_LISTENER__TCP__EXTERNAL=1883 -p 18083:18083 -p 1883:1883 emqx/emqx:latest``
+``docker run -d --name emqx -e EMQX_ZONES__DEFAULT__LISTENERS__MQTT_TCP__BIND=1883 -p 18083:18083 -p 1883:1883 emqx/emqx:latest``
 
 #### EMQ Loaded Modules Configuration
 
@@ -213,7 +213,7 @@ Let's create a static node list cluster from docker-compose.
       environment:
       - "EMQX_NAME=emqx"
       - "EMQX_HOST=node1.emqx.io"
-      - "EMQX_CLUSTER__DISCOVERY=static"
+      - "EMQX_CLUSTER__DISCOVERY_STRATEGY=static"
       - "EMQX_CLUSTER__STATIC__SEEDS=emqx@node1.emqx.io, emqx@node2.emqx.io"
       networks:
         emqx-bridge:
@@ -225,7 +225,7 @@ Let's create a static node list cluster from docker-compose.
       environment:
       - "EMQX_NAME=emqx"
       - "EMQX_HOST=node2.emqx.io"
-      - "EMQX_CLUSTER__DISCOVERY=static"
+      - "EMQX_CLUSTER__DISCOVERY_STRATEGY=static"
       - "EMQX_CLUSTER__STATIC__SEEDS=emqx@node1.emqx.io, emqx@node2.emqx.io"
       networks:
         emqx-bridge: