From 974e1397b3565dc53cb52d56cf20a89bbc159295 Mon Sep 17 00:00:00 2001
From: lecjy <565572696@qq.com>
Date: Fri, 13 Oct 2023 23:50:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E7=9A=84mysql=E9=95=9C=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 containerization/docker-compose.yml                        | 3 ++-
 containerization/dockerfiles/mysql-8.1-nacos               | 7 -------
 .../{dockerfiles/nacos_mysql.sql => mysql/nacos.sql}       | 0
 containerization/scripts/build.sh                          | 3 ---
 cskefu-backend/README.md                                   | 2 +-
 5 files changed, 3 insertions(+), 12 deletions(-)
 delete mode 100644 containerization/dockerfiles/mysql-8.1-nacos
 rename containerization/{dockerfiles/nacos_mysql.sql => mysql/nacos.sql} (100%)

diff --git a/containerization/docker-compose.yml b/containerization/docker-compose.yml
index 255c63be..7c3cc096 100644
--- a/containerization/docker-compose.yml
+++ b/containerization/docker-compose.yml
@@ -210,7 +210,7 @@ services:
       - rabbitmq
 
   mysql:
-    image: cskefu/mysql-8.1:nacos
+    image: mysql:8.1
     container_name: mysql
     restart: always
     environment:
@@ -222,6 +222,7 @@ services:
       - 3306
     volumes:
       - ./mysql/data:/var/lib/mysql
+      - ./mysql/nacos.sql:/docker-entrypoint-initdb.d/nacos.sql
     command: --max_allowed_packet=32505856
 
   # https://hub.docker.com/r/nacos/nacos-server
diff --git a/containerization/dockerfiles/mysql-8.1-nacos b/containerization/dockerfiles/mysql-8.1-nacos
deleted file mode 100644
index fa5e56d9..00000000
--- a/containerization/dockerfiles/mysql-8.1-nacos
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM mysql:8.1
-
-ADD nacos_mysql.sql /nacos/nacos_mysql.sql
-
-CMD ["mysqld"]
-
-CMD ["mysql -uroot -p$MYSQL_ROOT_PASSWORD nacos_config < /nacos/nacos_mysql.sql"]
diff --git a/containerization/dockerfiles/nacos_mysql.sql b/containerization/mysql/nacos.sql
similarity index 100%
rename from containerization/dockerfiles/nacos_mysql.sql
rename to containerization/mysql/nacos.sql
diff --git a/containerization/scripts/build.sh b/containerization/scripts/build.sh
index 5d0d3b5b..dcd8f954 100644
--- a/containerization/scripts/build.sh
+++ b/containerization/scripts/build.sh
@@ -1,12 +1,9 @@
 #!/bin/bash
 
 docker build -f openjdk-21-debian-stretch-slim -t openjdk-21:debian-stretch-slim .
-docker build -f mysql-8.1-nacos -t mysql-8.1:nacos .
 
 docker tag openjdk-21:debian-stretch-slim cskefu/openjdk-21:debian-stretch-slim
-docker tag mysql-8.1:nacos cskefu/mysql-8.1:nacos
 
 docker login
 
 docker push cskefu/openjdk-21:debian-stretch-slim
-docker push cskefu/mysql-8.1:nacos
\ No newline at end of file
diff --git a/cskefu-backend/README.md b/cskefu-backend/README.md
index 839e4e52..13018e2e 100644
--- a/cskefu-backend/README.md
+++ b/cskefu-backend/README.md
@@ -2,7 +2,7 @@
 
 - Java21
 - Spring Boot 3
-- Spring Cloud两种方案，采纳的是方案一
+- Spring Cloud两种方案，采纳方案一
     - 方案一：Spring Cloud，docker-compose方案
         - 注册中心 Nacos
         - 声明式服务调用 OpenFeign