diff --git a/apps/mysql/5.6.51/docker-compose.yml b/apps/mysql/5.6.51/docker-compose.yml index 841e739a5..4a78d9eb6 100644 --- a/apps/mysql/5.6.51/docker-compose.yml +++ b/apps/mysql/5.6.51/docker-compose.yml @@ -12,16 +12,14 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:3306 volumes: - - ./data:/var/lib/mysql + - ./data/:/var/lib/mysql - ./conf/my.cnf:/etc/mysql/my.cnf - ./log:/var/log/mysql - - /etc/timezone:/etc/timezone:ro - - /etc/localtime:/etc/localtime:ro command: - --explicit-defaults-for-timestamp=1 - --lower-case-table-names=1 --character-set-server=utf8mb4 --collation-server=utf8mb4_general_ci + --explicit_defaults_for_timestamp=true + --lower_case_table_names=1 labels: createdBy: "Apps" networks: diff --git a/apps/mysql/5.7.42/conf/my.cnf b/apps/mysql/5.7.44/conf/my.cnf similarity index 100% rename from apps/mysql/5.7.42/conf/my.cnf rename to apps/mysql/5.7.44/conf/my.cnf diff --git a/apps/mysql/5.7.42/data.yml b/apps/mysql/5.7.44/data.yml similarity index 100% rename from apps/mysql/5.7.42/data.yml rename to apps/mysql/5.7.44/data.yml diff --git a/apps/mysql/5.7.42/docker-compose.yml b/apps/mysql/5.7.44/docker-compose.yml similarity index 94% rename from apps/mysql/5.7.42/docker-compose.yml rename to apps/mysql/5.7.44/docker-compose.yml index b407ff1bf..052adb437 100644 --- a/apps/mysql/5.7.42/docker-compose.yml +++ b/apps/mysql/5.7.44/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: mysql: - image: mysql:5.7.42 + image: mysql:5.7.44 container_name: ${CONTAINER_NAME} restart: always environment: diff --git a/apps/mysql/8.0.33/conf/my.cnf b/apps/mysql/8.2.0/conf/my.cnf similarity index 83% rename from apps/mysql/8.0.33/conf/my.cnf rename to apps/mysql/8.2.0/conf/my.cnf index 30e942001..6877bbfc9 100644 --- a/apps/mysql/8.0.33/conf/my.cnf +++ b/apps/mysql/8.2.0/conf/my.cnf @@ -5,7 +5,7 @@ datadir=/var/lib/mysql socket=/var/run/mysqld/mysqld.sock secure-file-priv=/var/lib/mysql-files user=mysql - +log_error_suppression_list='MY-013360' character_set_server=utf8 lower_case_table_names=1 diff --git a/apps/mysql/8.0.33/data.yml b/apps/mysql/8.2.0/data.yml similarity index 100% rename from apps/mysql/8.0.33/data.yml rename to apps/mysql/8.2.0/data.yml diff --git a/apps/mysql/8.0.33/docker-compose.yml b/apps/mysql/8.2.0/docker-compose.yml similarity index 95% rename from apps/mysql/8.0.33/docker-compose.yml rename to apps/mysql/8.2.0/docker-compose.yml index b0f9d23b3..1135e263a 100644 --- a/apps/mysql/8.0.33/docker-compose.yml +++ b/apps/mysql/8.2.0/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: mysql: - image: mysql:8.0.33 + image: mysql:8.2.0 container_name: ${CONTAINER_NAME} restart: always environment: @@ -21,7 +21,6 @@ services: createdBy: "Apps" command: - --default-authentication-plugin=mysql_native_password - networks: 1panel-network: external: true diff --git a/apps/mysql/data.yml b/apps/mysql/data.yml index 16f35f8d8..3a380c24e 100644 --- a/apps/mysql/data.yml +++ b/apps/mysql/data.yml @@ -13,8 +13,8 @@ additionalProperties: shortDescEn: Open source relational database management system type: runtime crossVersionUpdate: false - limit: 1 - recommend: 4 + limit: 0 + recommend: 0 website: https://www.mysql.com github: https://github.com/mysql/mysql-server document: https://dev.mysql.com/doc/