From 45d4301110a4fb89b6f34b532e41eddecd1e2183 Mon Sep 17 00:00:00 2001
From: lamter <lamter.fu@gmail.com>
Date: Thu, 27 Apr 2017 13:07:30 +0800
Subject: [PATCH] =?UTF-8?q?=20-=20change=20:=20Dockfile=20=E4=B8=8D?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=85=A5=E5=8F=A3=E7=82=B9ENTRYPOINT=20?=
 =?UTF-8?q?=EF=BC=8C=E5=90=A6=E5=88=99=E4=B8=8D=E8=83=BD=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=20-it=20=E4=BA=A4=E4=BA=92=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vn.docker/Dockerfile     | 6 +++---
 vn.docker/server_vnpy.sh | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/vn.docker/Dockerfile b/vn.docker/Dockerfile
index f51562cc..83ef834b 100644
--- a/vn.docker/Dockerfile
+++ b/vn.docker/Dockerfile
@@ -37,7 +37,6 @@ RUN    echo "开始配置系vnpy环境" \
     && apt-get clean \
     && echo "安装 ta-lib 内核" \
     && cd /opt \
-#    && wget -t 0 http://prdownloads.sourceforge.net/ta-lib/ta-lib-0.4.0-src.tar.gz \
     && wget -t 0 http://kent.dl.sourceforge.net/project/ta-lib/ta-lib/0.4.0/ta-lib-0.4.0-src.tar.gz \
     && tar -zxvf ta-lib-0.4.0-src.tar.gz \
     && rm ta-lib-0.4.0-src.tar.gz \
@@ -64,6 +63,7 @@ RUN    echo "开始配置系vnpy环境" \
     && conda clean -ay \
     && echo "安装结束"
 
-WORKDIR /srv/vnpy/vn.trader
+WORKDIR /srv/vnpy
 
-ENTRYPOINT python /srv/vnpy/vn.trader/vtServer.py
\ No newline at end of file
+# 暂时不设置入口点，否则不能使用 -it 交互模式
+# ENTRYPOINT python /srv/vnpy/vn.trader/vtServer.py
\ No newline at end of file
diff --git a/vn.docker/server_vnpy.sh b/vn.docker/server_vnpy.sh
index 0938f63b..4c5490bf 100755
--- a/vn.docker/server_vnpy.sh
+++ b/vn.docker/server_vnpy.sh
@@ -6,4 +6,4 @@ docker run --name vnpy --rm \
     -v `pwd`/vn.trader/tmp/VT_setting.json:/etc/vnpy/VT_setting.json \
     -p 2014:2014 -p 602:602 \
     vnpy:latest \
-    --VT_setting /etc/vnpy/VT_setting.json
+    python /srv/vnpy/vn.trader/vtServer.py --VT_setting /etc/vnpy/VT_setting.json