From 9d693d2eefbb5aa62738a0487fd8f7e9a4030af1 Mon Sep 17 00:00:00 2001
From: Acdiost <38416288+acdiost@users.noreply.github.com>
Date: Wed, 13 Jul 2022 14:28:33 +0800
Subject: [PATCH 1/2] Update docker-compose.yml

---
 docker-compose.yml | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 41bcc21..9b8cceb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,20 +5,31 @@ services:
     image: mysql:8
     container_name: ferry_mysql
     restart: unless-stopped
+    # 可开放出来
+    #ports:
+    #  - 3306:3306
     environment:
       MYSQL_ROOT_PASSWORD: '123456'
       MYSQL_DATABASE: 'ferry'
       MYSQL_USER: 'ferry'
       MYSQL_PASSWORD: '123456'
-
+    volumes:
+      - './mysql/db:/var/lib/mysql'
+      - '/etc/localtime:/etc/localtime:ro'
 
   ferry_redis:
     container_name: ferry_redis
     image: redis:latest
     restart: unless-stopped
+    # 可开放出来
+    #ports:
+    #  - 6379:6379
     command: redis-server --save 60 1 --loglevel warning
 
   ferry:
+    build:
+      context: "."
+      dockerfile: "Dockerfile"
     image: ferry:latest
     container_name: ferry
     restart: unless-stopped
@@ -28,4 +39,10 @@ services:
     ports:
       - "8002:8002"
     volumes:
-      - ./config:/opt/workflow/ferry/config
+      - '/etc/localtime:/etc/localtime:ro'
+      - './config:/opt/workflow/ferry/config'
+    logging:
+      driver: json-file
+      options:
+        max-size: "10m"
+        max-file: "10"

From d0aada569847e02b2b5325c0f834d4d618eb68cd Mon Sep 17 00:00:00 2001
From: Acdiost <38416288+acdiost@users.noreply.github.com>
Date: Wed, 13 Jul 2022 14:43:29 +0800
Subject: [PATCH 2/2] =?UTF-8?q?docs:=20=E6=96=B0=E5=A2=9E=20docker=20?=
 =?UTF-8?q?=E9=83=A8=E7=BD=B2=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/README.md b/README.md
index b2b2e71..4e20aed 100644
--- a/README.md
+++ b/README.md
@@ -79,6 +79,26 @@
 <ul><li>用户、角色、岗位的增删查改，批量删除，多条件搜索</li><li>角色、岗位数据导出Excel</li><li>重置用户密码</li><li>维护个人信息，上传管理头像，修改当前账户密码</li><li>部门的增删查改</li><li>菜单目录、跳转、按钮及API接口的增删查改</li><li>登陆日志管理</li><li>左菜单权限控制</li><li>页面按钮权限控制</li><li>API接口权限控制</li></ul>
 <!-- /wp:list -->
 
+
+## 部署
+
+docker-compose 快速开始：
+
+```bash
+git clone https://github.com/lanyulei/ferry.git
+cd ferry
+
+# 若需初始化
+touch config/needinit
+# 需要提前安装 docker 和 docker-compose
+docker-compose up -d
+```
+
+测试访问：  
+http://ip:8002
+
+---
+
 快速安装部署:  
 ```
 bash build.sh install