From 4bc97394dc88e85668157cd03861abd21b789122 Mon Sep 17 00:00:00 2001
From: hxsherry <1053288784@qq.com>
Date: Sun, 28 Jan 2018 22:36:50 +0800
Subject: [PATCH] Add more things into Dockerfile.

---
 Dockerfile         | 19 ++++++++++++-------
 docker-compose.yml | 10 ++++++++++
 2 files changed, 22 insertions(+), 7 deletions(-)
 create mode 100644 docker-compose.yml

diff --git a/Dockerfile b/Dockerfile
index 100265b..3fb5b24 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,19 @@
-# 使用最新的golang作为母镜像
-FROM golang:latest
+# 使用1.8的golang作为母镜像
+FROM golang:1.8
 
 # 维护者信息
 MAINTAINER eyeblue "eyebluecn@126.com"
 
-WORKDIR $GOPATH/src/hellodocker
-ADD . $GOPATH/src/hellodocker
-RUN go build .
+# 指定工作目录就是 tank
+WORKDIR $GOPATH/src/tank
 
+# 将tank项目下的所有文件移动到golang镜像中去
+ADD . $GOPATH/src/tank
 
-EXPOSE 8080
+# 开始编译
+RUN ./build/pack/build.sh
 
-ENTRYPOINT ["./hellodocker"]
+# 暴露6010端口
+EXPOSE 6010
+
+ENTRYPOINT ["../../bin/tank"]
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..e13b6f8
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,10 @@
+version: '3'
+services:
+
+  web:
+    build: .
+    ports:
+     - "5000:5000"
+
+  redis:
+    image: "redis:alpine"
\ No newline at end of file