From 38dbd38f67cbfcf63664ff876282a05e81923661 Mon Sep 17 00:00:00 2001
From: CzBiX <gliuwr@gmail.com>
Date: Tue, 23 Feb 2016 12:20:34 +0800
Subject: [PATCH] [docker] refine Dockerfile

---
 tools/docker/Dockerfile           | 3 ++-
 tools/docker/docker-entrypoint.sh | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index a829585b..33ee0099 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -4,6 +4,7 @@ RUN go get -u github.com/v2ray/v2ray-core \
   && rm -f $GOPATH/bin/build \
   && go install github.com/v2ray/v2ray-core/tools/build \
   && build \
+  && mv bin/v2ray-custom-linux-64/v2ray bin \
   && rm -rf pkg src
 
 EXPOSE 27183
@@ -11,4 +12,4 @@ COPY gen-server-cfg.sh /go/gen-server-cfg.sh
 COPY docker-entrypoint.sh /entrypoint.sh
 
 ENTRYPOINT ["/entrypoint.sh"]
-CMD ["/go/bin/v2ray-custom-linux-64/v2ray", "--config=/go/server-cfg.json"]
+CMD ["v2ray", "--config=/go/server-cfg.json"]
diff --git a/tools/docker/docker-entrypoint.sh b/tools/docker/docker-entrypoint.sh
index db1a3427..d195013a 100755
--- a/tools/docker/docker-entrypoint.sh
+++ b/tools/docker/docker-entrypoint.sh
@@ -1,8 +1,10 @@
 #!/bin/bash
 set -e
 
-if [ ! -e "server-cfg.json" ]; then
-    ./gen-server-cfg.sh
+if [ "$1" = 'v2ray' ]; then
+  if [ ! -e "server-cfg.json" ]; then
+      ./gen-server-cfg.sh
+  fi
 fi
 
 exec "$@"