From 1bcbfa6ea019584b5070b483c634f869e8985559 Mon Sep 17 00:00:00 2001
From: zhanglong <huangmnlove@163.com>
Date: Sun, 7 Jul 2019 22:35:44 +0800
Subject: [PATCH] release 1.1.0 and refactor env #41

---
 README.md                   | 6 ++++++
 build/Dockerfile            | 9 ++++++++-
 build/bin/docker-startup.sh | 6 ++++--
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 61298f7..0e77570 100644
--- a/README.md
+++ b/README.md
@@ -92,6 +92,12 @@ Run the following command：
 | MYSQL_SLAVE_SERVICE_HOST      | mysql slave host                       |                                        |
 | MYSQL_SLAVE_SERVICE_PORT      | mysql slave database port              | default :3306                          |
 | MYSQL_DATABASE_NUM      | It indicates the number of database             | default :2                          |
+| JVM_XMS      |  -Xms             | default :2g                          |
+| JVM_XMX      |  -Xmx            | default :2g                          |
+| JVM_XMN      |  -Xmn           | default :1g                          |
+| JVM_MS      |  -XX:MetaspaceSize          | default :128m                          |
+| JVM_MMS      |  -XX:MaxMetaspaceSize          | default :320m                          |
+| NACOS_DEBUG      |  enable remote debug          | y/n default :n                          |
 ## Nacos + Grafana + Prometheus
 Usage reference：[Nacos monitor-guide](https://nacos.io/zh-cn/docs/monitor-guide.html)
 
diff --git a/build/Dockerfile b/build/Dockerfile
index 99c49d6..bf4f94f 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -11,9 +11,16 @@ ENV MODE="cluster" \
     JAVA_HOME="/usr/lib/jvm/java-1.8.0-openjdk" \
     NACOS_USER="nacos" \
     JAVA="/usr/lib/jvm/java-1.8.0-openjdk/bin/java" \
+    JVM_XMS="2g" \
+    JVM_XMX="2g" \
+    JVM_XMN="1g" \
+    JVM_XMN="2g" \
+    JVM_MS="128m" \
+    JVM_MMS="320m" \
+    NACOS_DEBUG="n" \
     TIME_ZONE="Asia/Shanghai"
 
-ARG NACOS_VERSION=1.0.1
+ARG NACOS_VERSION=1.1.0
 
 WORKDIR /$BASE_DIR
 
diff --git a/build/bin/docker-startup.sh b/build/bin/docker-startup.sh
index 9681d58..70b52f1 100755
--- a/build/bin/docker-startup.sh
+++ b/build/bin/docker-startup.sh
@@ -36,8 +36,10 @@ if [[ "${MODE}" == "standalone" ]]; then
     JAVA_OPT="${JAVA_OPT} -Dnacos.standalone=true"
 else
 
-  JAVA_OPT="${JAVA_OPT} -server -Xms2g -Xmx2g -Xmn1g -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=320m"
-  JAVA_OPT="${JAVA_OPT} -Xdebug -Xrunjdwp:transport=dt_socket,address=9555,server=y,suspend=n"
+  JAVA_OPT="${JAVA_OPT} -server -Xms${JVM_XMS} -Xmx${JVM_XMX} -Xmn${JVM_XMN} -XX:MetaspaceSize=${JVM_MS} -XX:MaxMetaspaceSize=${JVM_MMS}"
+  if [[ "${NACOS_DEBUG}" == "y" ]]; then
+    JAVA_OPT="${JAVA_OPT} -Xdebug -Xrunjdwp:transport=dt_socket,address=9555,server=y,suspend=n"
+  fi
   JAVA_OPT="${JAVA_OPT} -XX:-OmitStackTraceInFastThrow -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${BASE_DIR}/logs/java_heapdump.hprof"
   JAVA_OPT="${JAVA_OPT} -XX:-UseLargePages"
   print_servers