Merge 44684cd26e into b8a28e945c

2016-11-28 09:30:05 +00:00 · 2016-11-28 09:30:05 +00:00 · 66cdd46335
commit 66cdd46335
parent b8a28e945c 44684cd26e
2 changed files with 16 additions and 0 deletions
--- a/.dockerignore
+++ b/.dockerignore
@ -0,0 +1,5 @@
+Dockerfile
+.git
+*~
+*#
+.#*
--- a/11
+++ b/11
@ -0,0 +1,11 @@
+FROM golang:1.6
+
+RUN go get github.com/tools/godep
+COPY . /go/src/github.com/fatedier/frp
+RUN cd /go/src/github.com/fatedier/frp   \
+ && make                                 \
+ && mv bin/frpc bin/frps /usr/local/bin  \
+ && mv conf/*.ini /
+WORKDIR /
+ENTRYPOINT ["frps"]
+EXPOSE 6000 7000 7500