From ad571de58123175d8a7250ee6d6adee47f3d569b Mon Sep 17 00:00:00 2001
From: xuwei-fit2cloud <wei@fit2cloud.com>
Date: Wed, 1 Nov 2023 10:11:37 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E8=B0=83=E6=95=B4=E9=95=9C=E5=83=8F?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 installer/dataease/docker-compose-apisix.yml | 6 +++---
 installer/dataease/docker-compose-mysql.yml  | 2 +-
 installer/dataease/docker-compose.yml        | 2 +-
 installer/dectl                              | 2 +-
 installer/install.sh                         | 1 -
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/installer/dataease/docker-compose-apisix.yml b/installer/dataease/docker-compose-apisix.yml
index e7e60626d7..231c894670 100644
--- a/installer/dataease/docker-compose-apisix.yml
+++ b/installer/dataease/docker-compose-apisix.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   apisix-dashboard:
-    image: apache/apisix-dashboard:3.0.1-alpine
+    image: registry.cn-qingdao.aliyuncs.com/dataease/apisix-dashboard:3.0.1-alpine
     container_name: apisix-dashboard
     restart: always
     volumes:
@@ -13,7 +13,7 @@ services:
       dataease-network:
 
   apisix:
-    image: apache/apisix:3.4.1-debian
+    image: registry.cn-qingdao.aliyuncs.com/dataease/apisix:3.6.0-debian
     container_name: apisix
     environment:
       - TZ=Asia/Shanghai
@@ -33,7 +33,7 @@ services:
       dataease-network:
 
   etcd:
-    image: bitnami/etcd:3.4.15
+    image: registry.cn-qingdao.aliyuncs.com/dataease/etcd:3.5.10
     container_name: apisix-etcd
     restart: always
     volumes:
diff --git a/installer/dataease/docker-compose-mysql.yml b/installer/dataease/docker-compose-mysql.yml
index 4813503de7..e0de6c26ce 100644
--- a/installer/dataease/docker-compose-mysql.yml
+++ b/installer/dataease/docker-compose-mysql.yml
@@ -2,7 +2,7 @@ version: '2.1'
 services:
 
   DE_MYSQL_HOST:
-    image: mysql:8.1.0
+    image: registry.cn-qingdao.aliyuncs.com/dataease/mysql:8.1.0
     container_name: ${DE_MYSQL_HOST}
     healthcheck:
       test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost", "-u${DE_MYSQL_USER}", "-p${DE_MYSQL_PASSWORD}", "--protocol","tcp"]
diff --git a/installer/dataease/docker-compose.yml b/installer/dataease/docker-compose.yml
index 0793ad9c54..6ce1b2f606 100644
--- a/installer/dataease/docker-compose.yml
+++ b/installer/dataease/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2.1'
 services:
 
   dataease:
-    image: registry.cn-qingdao.aliyuncs.com/dataease/dataease2.0:DE_TAG
+    image: registry.cn-qingdao.aliyuncs.com/dataease/dataease:DE_TAG
     container_name: dataease
     ports:
       - ${DE_PORT}:8100
diff --git a/installer/dectl b/installer/dectl
index 16d269957e..4bb1dfaacc 100644
--- a/installer/dectl
+++ b/installer/dectl
@@ -83,7 +83,7 @@ function _healthcheck() {
    echo
 }
 function _get_current_version() {
-   de_current_version=$(grep "^    image:.*dataease2.0:" ${DE_RUNNING_BASE}/docker-compose.yml | awk -F'dataease2.0:' '{print $2}')
+   de_current_version=$(grep "^    image:.*dataease:" ${DE_RUNNING_BASE}/docker-compose.yml | awk -F'dataease:' '{print $2}')
    echo $de_current_version
 }
 function status() {
diff --git a/installer/install.sh b/installer/install.sh
index 398f25a972..38271eecbc 100644
--- a/installer/install.sh
+++ b/installer/install.sh
@@ -258,5 +258,4 @@ if [[ $http_code != 200 ]];then
 fi
 
 echo -e "======================= 安装完成 =======================\n" 2>&1 | tee -a ${CURRENT_DIR}/install.log
-echo -e "请通过以下方式访问:\n URL: http://\$LOCAL_IP:$DE_PORT\n 用户名: admin\n 初始密码: dataease" 2>&1 | tee -a ${CURRENT_DIR}/install.log