diff --git a/installer/dataease/docker-compose-mysql.yml b/installer/dataease/docker-compose-mysql.yml index 013587acde..534a36640d 100644 --- a/installer/dataease/docker-compose-mysql.yml +++ b/installer/dataease/docker-compose-mysql.yml @@ -2,7 +2,7 @@ version: '2.1' services: mysql: - image: registry.cn-qingdao.aliyuncs.com/dataease/mysql:5.7.43 + image: registry.cn-qingdao.aliyuncs.com/dataease/mysql:8.1.0 container_name: mysql healthcheck: test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost", "-u${DE_MYSQL_USER}", "-p${DE_MYSQL_PASSWORD}"] diff --git a/installer/dataease/install.conf b/installer/dataease/install.conf index a5ab1c7962..43c0f467f6 100644 --- a/installer/dataease/install.conf +++ b/installer/dataease/install.conf @@ -30,7 +30,7 @@ DE_MYSQL_USER=root ## 数据库密码 DE_MYSQL_PASSWORD=Password123@mysql ## 数据库参数 -DE_MYSQL_PARAMS="autoReconnect=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false" +DE_MYSQL_PARAMS="autoReconnect=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true" # Apache Doris 配置 ## 是否使用外部 Apache Doris diff --git a/installer/dataease/install.sh b/installer/dataease/install.sh index 4e6c8faf8b..b55a654a26 100755 --- a/installer/dataease/install.sh +++ b/installer/dataease/install.sh @@ -123,12 +123,22 @@ keep_doris="false" if [[ -f ${DE_RUN_BASE}/docker-compose-doris.yml ]]; then current_doris_version=$(grep '^ image:' ${DE_RUN_BASE}/docker-compose-doris.yml | head -1 | cut -d ':' -f3) if [[ ! $current_doris_version =~ "v1.2.4" ]]; then - echo "不升级doris,备份 docker-compose-doris.yml 文件" + echo "不升级doris,备份 docker-compose-doris.yml 文件" | tee -a ${CURRENT_DIR}/install.log keep_doris="true" \cp ${DE_RUN_BASE}/docker-compose-doris.yml ${DE_RUN_BASE}/docker-compose-doris.yml.bak fi fi +keep_mysql="false" +if [[ -f ${DE_RUN_BASE}/docker-compose-mysql.yml ]]; then + current_mysql_version=$(grep '^ image:' ${DE_RUN_BASE}/docker-compose-mysql.yml | head -1 | cut -d ':' -f3) + if [[ ! $current_mysql_version =~ "8." ]]; then + echo "不升级MySQL,备份 docker-compose-mysql.yml 文件" | tee -a ${CURRENT_DIR}/install.log + keep_mysql="true" + \cp ${DE_RUN_BASE}/docker-compose-mysql.yml ${DE_RUN_BASE}/docker-compose-mysql.yml.bak + fi +fi + mkdir -p ${DE_RUN_BASE} @@ -156,6 +166,10 @@ if [ ${keep_doris} = "true" ]; then \mv ${DE_RUN_BASE}/docker-compose-doris.yml.bak ${DE_RUN_BASE}/docker-compose-doris.yml fi +if [ ${keep_mysql} = "true" ]; then + \mv ${DE_RUN_BASE}/docker-compose-mysql.yml.bak ${DE_RUN_BASE}/docker-compose-mysql.yml +fi + DE_MYSQL_HOST_ORIGIN=$DE_MYSQL_HOST DE_MYSQL_PORT_ORIGIN=$DE_MYSQL_PORT