From 018d261eb2c751f68ea906e4d3d5a319c07828d4 Mon Sep 17 00:00:00 2001
From: hxsherry <1053288784@qq.com>
Date: Sun, 28 Jan 2018 23:54:53 +0800
Subject: [PATCH] Finish the first version of docker.

---
 Dockerfile           |  3 ++-
 build/conf/tank.json |  2 +-
 docker-compose.yml   | 33 ++++++++++++++++++++++++++-------
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index dadc9ff..a34c473 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,4 +16,5 @@ RUN ./build/pack/build.sh
 # 暴露6010端口
 EXPOSE 6010
 
-ENTRYPOINT ["../../bin/tank"]
+# tank作为执行文件
+ENTRYPOINT ["./dist/tank-1.0.2/tank"]
diff --git a/build/conf/tank.json b/build/conf/tank.json
index f216409..cebbe6f 100644
--- a/build/conf/tank.json
+++ b/build/conf/tank.json
@@ -2,7 +2,7 @@
   "ServerPort": 6010,
   "LogToConsole": false,
   "MysqlPort": 3306,
-  "MysqlHost": "127.0.0.1",
+  "MysqlHost": "db",
   "MysqlSchema": "tank",
   "MysqlUserName": "tank",
   "MysqlPassword": "tank123",
diff --git a/docker-compose.yml b/docker-compose.yml
index e13b6f8..3c17b7c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,10 +1,29 @@
-version: '3'
+version: "1.0.2"
 services:
 
-  web:
-    build: .
-    ports:
-     - "5000:5000"
+   db:
+     image: mysql:5.7
+     volumes:
+       - db_data:/var/lib/mysql
+     restart: always
+     environment:
+       MYSQL_ROOT_PASSWORD: tank123
+       MYSQL_DATABASE: tank
+       MYSQL_USER: tank
+       MYSQL_PASSWORD: tank123
 
-  redis:
-    image: "redis:alpine"
\ No newline at end of file
+   tank:
+     build: .
+     depends_on:
+       - db
+     ports:
+       - "6010:6010"
+     restart: always
+     environment:
+       TANK_DB_HOST: db
+       TANK_DB_PORT: 3306
+       TANK_DB_USER: tank
+       TANK_DB_PASSWORD: tank123
+
+volumes:
+    db_data:
\ No newline at end of file