From d430ca9a34844d77de24be48284a86f43c3c8e82 Mon Sep 17 00:00:00 2001
From: okxlin <okxlin@gmail.com>
Date: Wed, 3 Apr 2024 13:31:22 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=9B=B4=E6=96=B0zabbix-mysql=206.4.13?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{6.4.4&mysql => 6.4.13&mysql}/.env.sample             | 0
 .../{6.4.4&mysql => 6.4.13&mysql}/conf/my.cnf             | 0
 apps/zabbix-server/{6.4.4&mysql => 6.4.13&mysql}/data.yml | 0
 .../{6.4.4&mysql => 6.4.13&mysql}/docker-compose.yml      | 8 ++++----
 apps/zabbix-server/{6.4.4 => 6.4.13}/.env.sample          | 0
 apps/zabbix-server/{6.4.4 => 6.4.13}/data.yml             | 0
 apps/zabbix-server/{6.4.4 => 6.4.13}/docker-compose.yml   | 6 +++---
 7 files changed, 7 insertions(+), 7 deletions(-)
 rename apps/zabbix-server/{6.4.4&mysql => 6.4.13&mysql}/.env.sample (100%)
 rename apps/zabbix-server/{6.4.4&mysql => 6.4.13&mysql}/conf/my.cnf (100%)
 rename apps/zabbix-server/{6.4.4&mysql => 6.4.13&mysql}/data.yml (100%)
 rename apps/zabbix-server/{6.4.4&mysql => 6.4.13&mysql}/docker-compose.yml (91%)
 rename apps/zabbix-server/{6.4.4 => 6.4.13}/.env.sample (100%)
 rename apps/zabbix-server/{6.4.4 => 6.4.13}/data.yml (100%)
 rename apps/zabbix-server/{6.4.4 => 6.4.13}/docker-compose.yml (88%)

diff --git a/apps/zabbix-server/6.4.4&mysql/.env.sample b/apps/zabbix-server/6.4.13&mysql/.env.sample
similarity index 100%
rename from apps/zabbix-server/6.4.4&mysql/.env.sample
rename to apps/zabbix-server/6.4.13&mysql/.env.sample
diff --git a/apps/zabbix-server/6.4.4&mysql/conf/my.cnf b/apps/zabbix-server/6.4.13&mysql/conf/my.cnf
similarity index 100%
rename from apps/zabbix-server/6.4.4&mysql/conf/my.cnf
rename to apps/zabbix-server/6.4.13&mysql/conf/my.cnf
diff --git a/apps/zabbix-server/6.4.4&mysql/data.yml b/apps/zabbix-server/6.4.13&mysql/data.yml
similarity index 100%
rename from apps/zabbix-server/6.4.4&mysql/data.yml
rename to apps/zabbix-server/6.4.13&mysql/data.yml
diff --git a/apps/zabbix-server/6.4.4&mysql/docker-compose.yml b/apps/zabbix-server/6.4.13&mysql/docker-compose.yml
similarity index 91%
rename from apps/zabbix-server/6.4.4&mysql/docker-compose.yml
rename to apps/zabbix-server/6.4.13&mysql/docker-compose.yml
index 5df4ad5a..44bc8d65 100644
--- a/apps/zabbix-server/6.4.4&mysql/docker-compose.yml
+++ b/apps/zabbix-server/6.4.13&mysql/docker-compose.yml
@@ -17,7 +17,7 @@ services:
       - MYSQL_PASSWORD=${PANEL_DB_USER_PASSWORD}
       - MYSQL_ROOT_PASSWORD=${MYSQL_PASSWORD}
     command: --character-set-server=utf8 --collation-server=utf8_bin --default-authentication-plugin=mysql_native_password
-    image: mysql:8.0.33
+    image: mysql:8.0.36
     labels:
       createdBy: Apps
 
@@ -36,7 +36,7 @@ services:
       - MYSQL_PASSWORD=${PANEL_DB_USER_PASSWORD}
       - MYSQL_ROOT_PASSWORD=${MYSQL_PASSWORD}
       - ZBX_JAVAGATEWAY=zabbix-java-gateway
-    image: zabbix/zabbix-server-mysql:alpine-6.4.4
+    image: zabbix/zabbix-server-mysql:alpine-6.4.13
     depends_on:
       - zabbix-java-gateway
       - mysql-server
@@ -48,7 +48,7 @@ services:
     restart: always
     networks:
       - 1panel-network
-    image: zabbix/zabbix-java-gateway:alpine-6.4.4
+    image: zabbix/zabbix-java-gateway:alpine-6.4.13
     labels:
       createdBy: Apps
 
@@ -66,7 +66,7 @@ services:
       - MYSQL_ROOT_PASSWORD=${MYSQL_PASSWORD}
     ports:
       - ${PANEL_APP_PORT_HTTP}:8080
-    image: zabbix/zabbix-web-nginx-mysql:alpine-6.4.4
+    image: zabbix/zabbix-web-nginx-mysql:alpine-6.4.13
     depends_on:
       - zabbix-server-mysql
       - mysql-server
diff --git a/apps/zabbix-server/6.4.4/.env.sample b/apps/zabbix-server/6.4.13/.env.sample
similarity index 100%
rename from apps/zabbix-server/6.4.4/.env.sample
rename to apps/zabbix-server/6.4.13/.env.sample
diff --git a/apps/zabbix-server/6.4.4/data.yml b/apps/zabbix-server/6.4.13/data.yml
similarity index 100%
rename from apps/zabbix-server/6.4.4/data.yml
rename to apps/zabbix-server/6.4.13/data.yml
diff --git a/apps/zabbix-server/6.4.4/docker-compose.yml b/apps/zabbix-server/6.4.13/docker-compose.yml
similarity index 88%
rename from apps/zabbix-server/6.4.4/docker-compose.yml
rename to apps/zabbix-server/6.4.13/docker-compose.yml
index 4d300f25..d75de32a 100644
--- a/apps/zabbix-server/6.4.4/docker-compose.yml
+++ b/apps/zabbix-server/6.4.13/docker-compose.yml
@@ -14,7 +14,7 @@ services:
       - MYSQL_USER=${PANEL_DB_USER}
       - MYSQL_PASSWORD=${PANEL_DB_USER_PASSWORD}
       - ZBX_JAVAGATEWAY=zabbix-java-gateway
-    image: zabbix/zabbix-server-mysql:alpine-6.4.4
+    image: zabbix/zabbix-server-mysql:alpine-6.4.13
     depends_on:
       - zabbix-java-gateway
     labels:
@@ -25,7 +25,7 @@ services:
     restart: always
     networks:
       - 1panel-network
-    image: zabbix/zabbix-java-gateway:alpine-6.4.4
+    image: zabbix/zabbix-java-gateway:alpine-6.4.13
     labels:
       createdBy: Apps
 
@@ -42,7 +42,7 @@ services:
       - MYSQL_PASSWORD=${PANEL_DB_USER_PASSWORD}
     ports:
       - ${PANEL_APP_PORT_HTTP}:8080
-    image: zabbix/zabbix-web-nginx-mysql:alpine-6.4.4
+    image: zabbix/zabbix-web-nginx-mysql:alpine-6.4.13
     depends_on:
       - zabbix-server-mysql
     labels: