Merge remote-tracking branch 'origin/develop' into develop

自动化部署脚本/x86架构/预定系统/new_auto.sh

@@ -335,7 +335,7 @@ fs5=$auto_java"/server_bag/docker.service"
 fs6=$auto_java"/server_bag/docker-20.10.7.tgz"
 fs7=$auto_java"/server_bag/uemqx5.8.7.tar.gz"
 fs8=$auto_java"/server_bag/java1.8.0_321.tar"
-fs9=$auto_java"/server_bag/umysql.tar"
+fs9=$auto_java"/server_bag/mysql-v8.4.7.tar.gz"
 fs10=$auto_java"/server_bag/redis6.2.6.tar"
 fs11=$auto_java"/server_bag/ufastdfs.tar"
 fs12=$auto_java"/new_auto.sh"
@@ -527,12 +527,15 @@ log "INFO" "检查到mysql已安装！  "
 else
     log "WARN" "mysql 未安装 "
     log "WARN" "mysql安装中。。。 "
-    $sudoset docker load -i $auto_java/server_bag/umysql.tar
-    $sudoset docker tag 89b1ec864830 139.9.60.86:5000/umysql:v4
-    $sudoset cp -rf $auto_java/server_bag/docker /usr/local/
-    $sudoset chmod 755 /usr/local/docker/mysql/my.cnf
+    $sudoset docker load -i $auto_java/server_bag/mysql-v8.4.7.tar.gz
+    $sudoset cp -rf $auto_java/mysql /opt/
+    $sudoset chmod -R 777 /opt/mysql
+    $sudoset chown -R 27:27 /opt/mysql/logs
+    $sudoset chmod 644 /opt/mysql/conf.d/my.cnf
+    $sudoset chown root:root /opt/mysql/conf.d/my.cnf
     sleep 3
-	$sudoset docker run -p 8306:3306 --name umysql --mac-address="02:42:ac:11:00:05" -v /usr/local/docker/mysql/conf:/etc/mysql/conf -v /usr/local/docker/mysql/my.cnf:/etc/mysql/my.cnf -v /usr/local/docker/mysql/conf.d:/etc/mysql/conf.d -v /usr/local/docker/mysql/logs:/var/log/mysql -v /usr/local/docker/mysql/data:/var/lib/mysql -v /usr/local/docker/mysql/mysql-files:/var/lib/mysql-files -v /etc/localtime:/etc/localtime:ro --restart=always -e MYSQL_ROOT_PASSWORD="dNrprU&2S" -itd 139.9.60.86:5000/umysql:v4
+	#$sudoset docker run -p 8306:3306 --name umysql --mac-address="02:42:ac:11:00:05" -v /usr/local/docker/mysql/conf:/etc/mysql/conf -v /usr/local/docker/mysql/my.cnf:/etc/mysql/my.cnf -v /usr/local/docker/mysql/conf.d:/etc/mysql/conf.d -v /usr/local/docker/mysql/logs:/var/log/mysql -v /usr/local/docker/mysql/data:/var/lib/mysql -v /usr/local/docker/mysql/mysql-files:/var/lib/mysql-files -v /etc/localtime:/etc/localtime:ro --restart=always -e MYSQL_ROOT_PASSWORD="dNrprU&2S" -itd 139.9.60.86:5000/umysql:v4
+    $sudoset docker run -d --name umysql -p 8306:3306 --restart=always --security-opt seccomp=unconfined --mac-address="02:42:ac:11:00:25" -e MYSQL_ROOT_PASSWORD="dNrprU&2S" -v /etc/localtime:/etc/localtime:ro -v /opt/mysql/data:/var/lib/mysql -v /opt/mysql/conf.d:/etc/mysql/conf.d -v /opt/mysql/logs:/var/log/mysql mysql:v8.4.7 --mysql-native-password=ON
     $sudoset docker ps
 fi
 sleep 30