From 8dabd3806d7cb8cab38971e1991252692dd49e3a Mon Sep 17 00:00:00 2001
From: tzengshinfu <tzengshinfu@gmail.com>
Date: Mon, 11 Mar 2024 10:48:22 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=A4=8D=E5=88=B6sql?=
 =?UTF-8?q?=E6=97=B6=E6=89=BE=E4=B8=8D=E5=88=B0=E6=A1=A3=E6=A1=88=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/copy.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 docker/copy.sh

diff --git a/docker/copy.sh b/docker/copy.sh
old mode 100644
new mode 100755
index 1841df75..23d61874
--- a/docker/copy.sh
+++ b/docker/copy.sh
@@ -9,8 +9,8 @@ usage() {
 
 # copy sql
 echo "begin copy sql "
-cp ../sql/ry_20230706.sql ./mysql/db
-cp ../sql/ry_config_20220929.sql ./mysql/db
+cp ../sql/ry_20231130.sql ./mysql/db
+cp ../sql/ry_config_20231204.sql ./mysql/db
 
 # copy html
 echo "begin copy html "

From 44f75af624913762e2a8cdfb924575362e8fd19c Mon Sep 17 00:00:00 2001
From: tzengshinfu <tzengshinfu@gmail.com>
Date: Mon, 11 Mar 2024 13:50:49 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=AE=B9=E5=99=A8?=
 =?UTF-8?q?=E5=90=AF=E5=8A=A8=E6=97=B6=E8=B7=B3=E8=BF=87dockerfile?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E6=8B=89=E5=8F=96=E5=AE=98=E6=96=B9=E6=98=A0?=
 =?UTF-8?q?=E5=83=8F=E6=AA=94=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/docker-compose.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 5fb8da1c..27d79b73 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -2,7 +2,6 @@ version : '3.8'
 services:
   ruoyi-nacos:
     container_name: ruoyi-nacos
-    image: nacos/nacos-server
     build:
       context: ./nacos
     environment:
@@ -18,7 +17,6 @@ services:
       - ruoyi-mysql
   ruoyi-mysql:
     container_name: ruoyi-mysql
-    image: mysql:5.7
     build:
       context: ./mysql
     ports:
@@ -40,7 +38,6 @@ services:
       MYSQL_ROOT_PASSWORD: password
   ruoyi-redis:
     container_name: ruoyi-redis
-    image: redis
     build:
       context: ./redis
     ports:
@@ -51,7 +48,6 @@ services:
     command: redis-server /home/ruoyi/redis/redis.conf
   ruoyi-nginx:
     container_name: ruoyi-nginx
-    image: nginx
     build:
       context: ./nginx
     ports:

From 221986a7bc0bf58015fae6045e9fa30329ffa4d3 Mon Sep 17 00:00:00 2001
From: tzengshinfu <tzengshinfu@gmail.com>
Date: Mon, 11 Mar 2024 14:05:51 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=89=88=E6=8E=A7?=
 =?UTF-8?q?=E5=BF=BD=E7=95=A5=E8=B7=AF=E5=BE=84(=E5=8A=A0=E5=85=A5?=
 =?UTF-8?q?=E5=AE=B9=E5=99=A8data/logs=E7=9B=AE=E5=BD=95)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/.gitignore | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 docker/.gitignore

diff --git a/docker/.gitignore b/docker/.gitignore
new file mode 100644
index 00000000..c5bc4977
--- /dev/null
+++ b/docker/.gitignore
@@ -0,0 +1,5 @@
+/mysql/data
+/mysql/logs
+/nacos/logs
+/nginx/logs
+/redis/data