feat: Support MySQL v8.4.2 (#1934)

This commit is contained in:
wanghe 2024-08-15 14:33:28 +08:00 committed by GitHub
parent e57dd0da3a
commit a64ed00579
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 66 additions and 3 deletions

View File

@ -0,0 +1,13 @@
[mysqld]
host-cache-size=0
skip-name-resolve
datadir=/var/lib/mysql
socket=/var/run/mysqld/mysqld.sock
secure-file-priv=/var/lib/mysql-files
user=mysql
pid-file=/var/run/mysqld/mysqld.pid
[client]
socket=/var/run/mysqld/mysqld.sock
!includedir /etc/mysql/conf.d/

17
apps/mysql/8.4.2/data.yml Executable file
View File

@ -0,0 +1,17 @@
additionalProperties:
formFields:
- default: mysql
envKey: PANEL_DB_ROOT_PASSWORD
labelEn: Root Password
labelZh: root用户密码
random: true
required: true
rule: paramComplexity
type: password
- default: 3306
envKey: PANEL_APP_PORT_HTTP
labelEn: Port
labelZh: 端口
required: true
rule: paramPort
type: number

View File

@ -0,0 +1,24 @@
services:
mysql:
image: mysql:8.4.2
container_name: ${CONTAINER_NAME}
restart: always
environment:
MYSQL_ROOT_PASSWORD: ${PANEL_DB_ROOT_PASSWORD}
networks:
- 1panel-network
ports:
- ${PANEL_APP_PORT_HTTP}:3306
volumes:
- ./data/:/var/lib/mysql
- ./conf/my.cnf:/etc/my.cnf
- ./log:/var/log/mysql
- /etc/timezone:/etc/timezone:ro
- /etc/localtime:/etc/localtime:ro
labels:
createdBy: "Apps"
command:
- --mysql-native-password=on
networks:
1panel-network:
external: true

View File

@ -0,0 +1,9 @@
#!/bin/bash
CONFIG_FILE="./conf/my.cnf"
if grep -q "skip-host-cache" "$CONFIG_FILE"; then
sed -i '/skip-host-cache/d' "$CONFIG_FILE"
else
echo "'skip-host-cache' does not exist in the configuration file."
fi

View File

@ -28,11 +28,11 @@
},
{
"matchFileNames": ["apps/mysql/8.0.*/*.yml"],
"allowedVersions": "<8.1"
"allowedVersions": "/^8.0.*/"
},
{
"matchFileNames": ["apps/mysql/8.2.*/*.yml"],
"allowedVersions": ">=8.2"
"matchFileNames": ["apps/mysql/8.4.*/*.yml"],
"allowedVersions": "/^8.4.*/"
},
{
"matchFileNames": ["apps/elasticsearch/7.*/*.yml"],