From 2ddc2efed5ef5fe344cb47fa485f04fb418246c6 Mon Sep 17 00:00:00 2001 From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com> Date: Mon, 5 Feb 2024 12:00:07 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=20mysql=208.0.36=20?= =?UTF-8?q?=E7=89=88=E6=9C=AC=20(#910)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/mysql/8.0.36/conf/my.cnf | 19 +++++++++++++++++++ apps/mysql/8.0.36/data.yml | 17 +++++++++++++++++ apps/mysql/8.0.36/docker-compose.yml | 26 ++++++++++++++++++++++++++ renovate.json | 8 ++++++-- 4 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 apps/mysql/8.0.36/conf/my.cnf create mode 100755 apps/mysql/8.0.36/data.yml create mode 100644 apps/mysql/8.0.36/docker-compose.yml diff --git a/apps/mysql/8.0.36/conf/my.cnf b/apps/mysql/8.0.36/conf/my.cnf new file mode 100644 index 00000000..6877bbfc --- /dev/null +++ b/apps/mysql/8.0.36/conf/my.cnf @@ -0,0 +1,19 @@ +[mysqld] +skip-host-cache +skip-name-resolve +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 +group_concat_max_len=1024000 +log_bin_trust_function_creators=1 + +pid-file=/var/run/mysqld/mysqld.pid +[client] +socket=/var/run/mysqld/mysqld.sock + +!includedir /etc/mysql/conf.d/ \ No newline at end of file diff --git a/apps/mysql/8.0.36/data.yml b/apps/mysql/8.0.36/data.yml new file mode 100755 index 00000000..e71c6a38 --- /dev/null +++ b/apps/mysql/8.0.36/data.yml @@ -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 diff --git a/apps/mysql/8.0.36/docker-compose.yml b/apps/mysql/8.0.36/docker-compose.yml new file mode 100644 index 00000000..c06257e9 --- /dev/null +++ b/apps/mysql/8.0.36/docker-compose.yml @@ -0,0 +1,26 @@ +version: '3' + +services: + mysql: + image: mysql:8.0.36 + 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: + - --default-authentication-plugin=mysql_native_password +networks: + 1panel-network: + external: true diff --git a/renovate.json b/renovate.json index de6d665b..fa302d15 100644 --- a/renovate.json +++ b/renovate.json @@ -27,8 +27,12 @@ "allowedVersions": "/^5.7.*/" }, { - "matchFileNames": ["apps/mysql/8.*/*.yml"], - "allowedVersions": "/^8.*/" + "matchFileNames": ["apps/mysql/8.0.*/*.yml"], + "allowedVersions": "<8.1" + }, + { + "matchFileNames": ["apps/mysql/8.2.*/*.yml"], + "allowedVersions": ">=8.2" }, { "matchFileNames": ["apps/elasticsearch/7.*/*.yml"],