From c1d47f3313e3db9125edc6ee19fbc0ec032792f4 Mon Sep 17 00:00:00 2001 From: huty Date: Thu, 19 Dec 2024 10:10:00 +0000 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=83=A8=E5=88=86=E9=95=9C?= =?UTF-8?q?=E5=83=8F=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/drawio/compose.yaml | 2 +- examples/mariadb/10/compose/compose.yaml | 2 +- examples/mariadb/10/stack/compose.yaml | 2 +- examples/mariadb/11/compose/compose.yaml | 31 +++++++++++++++ examples/mariadb/11/compose/conf/my.cnf | 4 ++ examples/mariadb/11/compose/conf/root.key | 1 + examples/mariadb/11/stack/compose.yaml | 46 +++++++++++++++++++++++ examples/mariadb/11/stack/my.cnf | 4 ++ examples/mariadb/11/stack/root.key | 1 + examples/portainer/compose.yaml | 2 +- 10 files changed, 91 insertions(+), 4 deletions(-) create mode 100644 examples/mariadb/11/compose/compose.yaml create mode 100644 examples/mariadb/11/compose/conf/my.cnf create mode 100644 examples/mariadb/11/compose/conf/root.key create mode 100644 examples/mariadb/11/stack/compose.yaml create mode 100644 examples/mariadb/11/stack/my.cnf create mode 100644 examples/mariadb/11/stack/root.key diff --git a/examples/drawio/compose.yaml b/examples/drawio/compose.yaml index 8ec5b18..2f13c09 100644 --- a/examples/drawio/compose.yaml +++ b/examples/drawio/compose.yaml @@ -27,7 +27,7 @@ services: environment: - DRAWIO_SERVER_URL="drawio:8080" plantuml-server: - image: plantuml/plantuml-server:v1.2024.7 + image: plantuml/plantuml-server:v1.2024.8 container_name: plantuml-server restart: always networks: diff --git a/examples/mariadb/10/compose/compose.yaml b/examples/mariadb/10/compose/compose.yaml index 55394c2..9089e81 100644 --- a/examples/mariadb/10/compose/compose.yaml +++ b/examples/mariadb/10/compose/compose.yaml @@ -2,7 +2,7 @@ version: "3.9" services: mariadb: - image: mariadb:11.5.2 + image: mariadb:10.11.10 container_name: mariadb hostname: mariadb restart: always diff --git a/examples/mariadb/10/stack/compose.yaml b/examples/mariadb/10/stack/compose.yaml index ad1debd..f1c8344 100644 --- a/examples/mariadb/10/stack/compose.yaml +++ b/examples/mariadb/10/stack/compose.yaml @@ -2,7 +2,7 @@ version: "3.9" services: mariadb: - image: mariadb:11.5.2 + image: mariadb:10.11.10 container_name: mariadb hostname: mariadb restart: always diff --git a/examples/mariadb/11/compose/compose.yaml b/examples/mariadb/11/compose/compose.yaml new file mode 100644 index 0000000..b5deeef --- /dev/null +++ b/examples/mariadb/11/compose/compose.yaml @@ -0,0 +1,31 @@ +version: "3.9" + +services: + mariadb: + image: mariadb:11.6.2 + container_name: mariadb + hostname: mariadb + restart: always + networks: + - db_network + ports: + - "3306:3306" + volumes: + - /usr/share/zoneinfo/Asia/Shanghai:/etc/localtime:ro + - ./data:/var/lib/mysql + - ./conf/my.cnf:/etc/mysql/conf.d/my.cnf + - ./conf/root.key:/etc/mysql/conf.d/root.key + environment: + - MYSQL_ROOT_PASSWORD_FILE=/etc/mysql/conf.d/root.key + +networks: + db_network: + name: db_network + external: true +# driver: bridge +# driver_opts: +# encrypted: 'true' +# ipam: +# driver: default +# config: +# - subnet: 10.21.22.1/24 diff --git a/examples/mariadb/11/compose/conf/my.cnf b/examples/mariadb/11/compose/conf/my.cnf new file mode 100644 index 0000000..ac541ff --- /dev/null +++ b/examples/mariadb/11/compose/conf/my.cnf @@ -0,0 +1,4 @@ +[mysqld] +max_connections = 1000 +character-set-server = utf8mb4 +collation-server = utf8mb4_unicode_ci diff --git a/examples/mariadb/11/compose/conf/root.key b/examples/mariadb/11/compose/conf/root.key new file mode 100644 index 0000000..37ddc91 --- /dev/null +++ b/examples/mariadb/11/compose/conf/root.key @@ -0,0 +1 @@ +5bkyVJsvXuSEZag8xChVXn9GEwHzrmvX diff --git a/examples/mariadb/11/stack/compose.yaml b/examples/mariadb/11/stack/compose.yaml new file mode 100644 index 0000000..bf0d7ac --- /dev/null +++ b/examples/mariadb/11/stack/compose.yaml @@ -0,0 +1,46 @@ +version: "3.9" + +services: + mariadb: + image: mariadb:11.6.2 + container_name: mariadb + hostname: mariadb + restart: always + networks: + - db_network + ports: + - "3306:3306" + volumes: + - /usr/share/zoneinfo/Asia/Shanghai:/etc/localtime:ro + - mariadb_db:/var/lib/mysql + configs: + - source: mariadb_conf + target: /etc/mysql/conf.d/my.cnf + mode: 0444 + secrets: + - mariadb_root_key + environment: + - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/mariadb_root_key + +volumes: + mariadb_db: + +configs: + mariadb_conf: + file: my.cnf + +secrets: + mariadb_root_key: + file: root.key + +networks: + db_network: + name: db_network + external: true +# driver: bridge +# driver_opts: +# encrypted: 'true' +# ipam: +# driver: default +# config: +# - subnet: 172.21.0.1/24 diff --git a/examples/mariadb/11/stack/my.cnf b/examples/mariadb/11/stack/my.cnf new file mode 100644 index 0000000..ac541ff --- /dev/null +++ b/examples/mariadb/11/stack/my.cnf @@ -0,0 +1,4 @@ +[mysqld] +max_connections = 1000 +character-set-server = utf8mb4 +collation-server = utf8mb4_unicode_ci diff --git a/examples/mariadb/11/stack/root.key b/examples/mariadb/11/stack/root.key new file mode 100644 index 0000000..37ddc91 --- /dev/null +++ b/examples/mariadb/11/stack/root.key @@ -0,0 +1 @@ +5bkyVJsvXuSEZag8xChVXn9GEwHzrmvX diff --git a/examples/portainer/compose.yaml b/examples/portainer/compose.yaml index bf101e2..90ef9ef 100644 --- a/examples/portainer/compose.yaml +++ b/examples/portainer/compose.yaml @@ -2,7 +2,7 @@ version: "3.9" services: portainer: - image: portainer/portainer-ce:2.23.0-alpine + image: portainer/portainer-ce:2.25.0-alpine container_name: portainer hostname: portainer restart: always