From 9ad421c294ecfce05422aa8e714a2697d057a44c Mon Sep 17 00:00:00 2001
From: Hui Li <huili@taosdata.com>
Date: Mon, 3 Aug 2020 16:52:46 +0800
Subject: [PATCH] [modify http port from 6020 to 6041]

---
 packaging/docker/Dockerfile     | 5 ++---
 packaging/docker/dockerbuild.sh | 4 ++--
 src/common/src/tglobal.c        | 2 +-
 src/kit/taosnetwork/client.c    | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile
index 22c1bc1902..3fb34e8286 100644
--- a/packaging/docker/Dockerfile
+++ b/packaging/docker/Dockerfile
@@ -5,14 +5,13 @@ WORKDIR /root
 COPY tdengine.tar.gz /root/
 RUN tar -zxf tdengine.tar.gz
 WORKDIR /root/TDengine-server/
-RUN sh install.sh
+RUN sh install.sh -e no
 
 
 ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib"
 ENV LANG=en_US.UTF-8
 ENV LANGUAGE=en_US:en
 ENV LC_ALL=en_US.UTF-8
-EXPOSE 6020 6030 6031 6032 6033 6034 6035 6036 6037 6038 6039 6040 6041 6042
-EXPOSE 6043 6044 6045 6046 6047 6048 6049 6050
+EXPOSE 6030 6031 6032 6033 6034 6035 6036 6037 6038 6039 6040 6041
 CMD ["taosd"]
 VOLUME [ "/var/lib/taos", "/var/log/taos","/etc/taos/" ]
diff --git a/packaging/docker/dockerbuild.sh b/packaging/docker/dockerbuild.sh
index aeea6a2a95..a0ac49bed1 100755
--- a/packaging/docker/dockerbuild.sh
+++ b/packaging/docker/dockerbuild.sh
@@ -2,5 +2,5 @@
 set -x
 $1
 docker build --rm -f "Dockerfile" -t tdengine/tdengine:$1 "."
-docker login -u tdengine -p ********  #replace the docker registry username and password
-docker push tdengine/tdengine:$1
\ No newline at end of file
+docker login -u tdengine -p $2  #replace the docker registry username and password
+docker push tdengine/tdengine:$1
diff --git a/src/common/src/tglobal.c b/src/common/src/tglobal.c
index c3dc078428..5ad1257f7d 100644
--- a/src/common/src/tglobal.c
+++ b/src/common/src/tglobal.c
@@ -126,7 +126,7 @@ int32_t tsMnodeEqualVnodeNum = 4;
 // restful
 int32_t  tsEnableHttpModule = 1;
 int32_t  tsRestRowLimit = 10240;
-uint16_t tsHttpPort = 6020;  // only tcp, range tcp[6020]
+uint16_t tsHttpPort = 6041;  // only tcp, range tcp[6041]
 int32_t  tsHttpCacheSessions = 1000;
 int32_t  tsHttpSessionExpire = 36000;
 int32_t  tsHttpMaxThreads = 2;
diff --git a/src/kit/taosnetwork/client.c b/src/kit/taosnetwork/client.c
index b2c7f729b5..706359ec20 100644
--- a/src/kit/taosnetwork/client.c
+++ b/src/kit/taosnetwork/client.c
@@ -43,7 +43,7 @@ typedef struct Arguments {
 
 static struct argp_option options[] = {
     {0, 'h', "host", 0, "The host to connect to TDEngine. Default is localhost.", 0},
-    {0, 'p', "port", 0, "The TCP or UDP port number to use for the connection. Default is 6020.", 1},
+    {0, 'p', "port", 0, "The TCP or UDP port number to use for the connection. Default is 6041.", 1},
     {0, 'm', "max port", 0, "The max TCP or UDP port number to use for the connection. Default is 6050.", 2}};
 
 static error_t parse_opt(int key, char *arg, struct argp_state *state) {
@@ -145,7 +145,7 @@ void *checkUPort(void *sarg) {
 }
 
 int main(int argc, char *argv[]) {
-  SArguments arguments = {"127.0.0.1", 6020, 6050};
+  SArguments arguments = {"127.0.0.1", 6041, 6050};
 
   argp_parse(&argp, argc, argv, 0, 0, &arguments);
 
-- 
GitLab