From 30ba5bb5f4d83615fd2d73876bc799108c8fd1ab Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Wed, 22 Mar 2023 22:49:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=20docker-compose.yml=20=E8=84=9A=E6=9C=AC=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/docker-compose.yml | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 7299e4e1..23d32a24 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,9 +1,11 @@
 version: '3'
 services:
   mariadb:
-    container_name: mariadb
     image: mariadb
     restart: always
+    container_name: mariadb
+    ports:
+      - '3306:3306'
     environment:
       TZ: Asia/Shanghai
       MYSQL_ROOT_PASSWORD: 你的root用户密码
@@ -11,29 +13,28 @@ services:
       MYSQL_DATABASE: continew_admin
       #MYSQL_USER: 你的数据库用户名
       #MYSQL_PASSWORD: 你的数据库密码
-    ports:
-      - '3306:3306'
     volumes:
-      - /docker/mysql/:/var/lib/mysql
-    privileged: true
+      - /docker/mysql/conf:/etc/mysql
+      - /docker/mysql/data:/var/lib/mysql
   redis:
-    container_name: redis
     image: redis:6.2.7
     restart: always
-    environment:
-      TZ: Asia/Shanghai
+    container_name: redis
     ports:
       - '6379:6379'
+    environment:
+      TZ: Asia/Shanghai
     volumes:
       - /docker/redis/conf/redis.conf:/usr/local/redis/config/redis.conf
       - /docker/redis/data:/data
       - /docker/redis/logs:/logs
     command: 'redis-server /usr/local/redis/config/redis.conf --appendonly yes --requirepass 123456'
-    privileged: true
   continew-admin-server:
-    container_name: continew-admin-server
     build: ./continew-admin
     restart: always
+    container_name: continew-admin-server
+    ports:
+      - '18000:18000'
     environment:
       TZ: Asia/Shanghai
       DB_HOST: 172.17.0.1
@@ -45,28 +46,24 @@ services:
       REDIS_PORT: 6379
       REDIS_PWD: 你的 Redis 密码
       REDIS_DB: 你的 Redis 数据库索引
-    ports:
-      - '18000:18000'
     volumes:
-      - /docker/continew-admin/logs:/logs
       - /docker/continew-admin/data/file:/data/file
       - /docker/continew-admin/data/avatar:/data/avatar
+      - /docker/continew-admin/logs:/logs
     depends_on:
       - redis
       - mariadb
-    privileged: true
   nginx:
-    container_name: nginx
     image: nginx:1.22.1
     restart: always
-    environment:
-      TZ: Asia/Shanghai
+    container_name: nginx
     ports:
       - '80:80'
       - '443:443'
+    environment:
+      TZ: Asia/Shanghai
     volumes:
       - /docker/nginx/conf/nginx.conf:/etc/nginx/nginx.conf
-      - /docker/nginx/logs:/var/log/nginx
       - /docker/nginx/cert:/etc/nginx/cert
       - /docker/continew-admin/web:/usr/share/nginx/html
-    privileged: true
\ No newline at end of file
+      - /docker/nginx/logs:/var/log/nginx