Merge pull request #6463 from dataease/pr@dev_v2_modify_version

chore: 调整镜像名称

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:

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"]

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

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() {

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