From f00f1922a542c8f5cbd3e01f75e6ee52ba75a2a5 Mon Sep 17 00:00:00 2001
From: brucedone <nicefish66@gmail.com>
Date: Fri, 18 Jan 2019 18:29:56 +0800
Subject: [PATCH 1/3] add docker-compose deploy

---
 README.md          | 13 +++++++++++++
 docker-compose.yml |  8 ++++++++
 requirements.txt   |  1 +
 3 files changed, 22 insertions(+)
 create mode 100644 docker-compose.yml

diff --git a/README.md b/README.md
index 88c223f..6ab5405 100644
--- a/README.md
+++ b/README.md
@@ -100,6 +100,19 @@ docker run --rm --name py12306 -p 8008:8008 -d -v $(pwd):/config -v py12306:/dat
 ```
 当前目录会多一个 12306.log 的日志文件， `tail -f 12306.log`
 
+## Docker-compose 使用
+**1. 在py12306目录下创建config目录***
+```mkdir config```
+
+**2. 修改配置文件**
+在`config`目录下，根据自己的个人配置创建`env.py`文件
+
+**3. 运行docker程序**
+在`docker-compose.yml`所在的目录使用命令
+```
+docker-compose up -d
+```
+
 ## Web 管理页面
 
 目前支持用户和任务以及实时日志查看，更多功能后续会不断加入
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..0a94e9c
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,8 @@
+version: "2"
+services:
+  go_home:
+    build: .
+    volumes:
+      - ./config:/config
+    ports:
+      - 18008:8008
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index 140e89b..2f2ad1c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,4 @@
+-i http://mirrors.aliyun.com/pypi/simple/  --trusted-host mirrors.aliyun.com
 appdirs==1.4.3
 beautifulsoup4==4.7.0
 bs4==0.0.1

From bef3e95cec74f6cca6a0abe30c672151aa494226 Mon Sep 17 00:00:00 2001
From: brucedone <nicefish66@gmail.com>
Date: Fri, 18 Jan 2019 18:32:44 +0800
Subject: [PATCH 2/3] fix the readme typo

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 6ab5405..d36b51c 100644
--- a/README.md
+++ b/README.md
@@ -87,7 +87,7 @@ python main.py
 
 
 ## Docker 使用
-**1. 将配置文件下载到本地***
+**1. 将配置文件下载到本地**
 ```bash
 docker run --rm pjialin/py12306 cat /config/env.py > env.py
 # 或
@@ -101,7 +101,7 @@ docker run --rm --name py12306 -p 8008:8008 -d -v $(pwd):/config -v py12306:/dat
 当前目录会多一个 12306.log 的日志文件， `tail -f 12306.log`
 
 ## Docker-compose 使用
-**1. 在py12306目录下创建config目录***
+**1. 在py12306目录下创建config目录**
 ```mkdir config```
 
 **2. 修改配置文件**

From 91763f314174ca0181e8e0aaa36409dc2787a7d4 Mon Sep 17 00:00:00 2001
From: Jalin <admin@pjialin.com>
Date: Tue, 22 Jan 2019 11:58:26 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20docker-compose=20?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                 |  3 ++-
 README.md                  | 12 ++++++------
 docker-compose.yml         |  8 --------
 docker-compose.yml.example | 12 ++++++++++++
 4 files changed, 20 insertions(+), 15 deletions(-)
 delete mode 100644 docker-compose.yml
 create mode 100644 docker-compose.yml.example

diff --git a/.gitignore b/.gitignore
index b75d241..1f372c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@ venv
 __pycache__
 env.py
 env.slave.py
-env.docker.py
\ No newline at end of file
+env.docker.py
+docker-compose.yml
\ No newline at end of file
diff --git a/README.md b/README.md
index d36b51c..a1e820c 100644
--- a/README.md
+++ b/README.md
@@ -100,14 +100,14 @@ docker run --rm --name py12306 -p 8008:8008 -d -v $(pwd):/config -v py12306:/dat
 ```
 当前目录会多一个 12306.log 的日志文件， `tail -f 12306.log`
 
-## Docker-compose 使用
-**1. 在py12306目录下创建config目录**
-```mkdir config```
+### Docker-compose 中使用
+**1. 复制配置文件**
+```
+cp docker-compose.yml.example docker-compose.yml
+```
 
-**2. 修改配置文件**
-在`config`目录下，根据自己的个人配置创建`env.py`文件
+**2. 从 docker-compose 运行**
 
-**3. 运行docker程序**
 在`docker-compose.yml`所在的目录使用命令
 ```
 docker-compose up -d
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index 0a94e9c..0000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-version: "2"
-services:
-  go_home:
-    build: .
-    volumes:
-      - ./config:/config
-    ports:
-      - 18008:8008
\ No newline at end of file
diff --git a/docker-compose.yml.example b/docker-compose.yml.example
new file mode 100644
index 0000000..6813067
--- /dev/null
+++ b/docker-compose.yml.example
@@ -0,0 +1,12 @@
+version: "2"
+services:
+  py12306:
+    build: .
+    volumes:
+      - ./env.py:/config/env.py
+      - py12306:/data
+    ports:
+      - 8008:8008
+
+volumes:
+  py12306: