dockerfile: update

Dockerfile

@@ -1,11 +1,17 @@
 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 bin/frpc /frpc \
- && mv conf/*.ini /
+ && mv bin/frps /frps \
+ && mv conf/frpc_min.ini /frpc.ini \
+ && mv conf/frps_min.ini /frps.ini \
+ && make clean
+
 WORKDIR /
-ENTRYPOINT ["frps"]
+
-EXPOSE 6000 7000 7500
+EXPOSE 80 443 6000 7000 7500
+
+ENTRYPOINT ["/frps"]

conf/frpc.ini

@@ -1,7 +1,4 @@
-# [common] is integral section
 [common]
-# A literal address or host name for IPv6 must be enclosed
-# in square brackets, as in "[::1]:80", "[ipv6-host]:http" or "[ipv6-host%zone]:80"
 server_addr = 0.0.0.0
 server_port = 7000
 # if you want to connect frps by http proxy, you can set http_proxy here or in global environment variables

conf/frpc_min.ini

@@ -0,0 +1,10 @@
+[common]
+server_addr = 0.0.0.0
+server_port = 7000
+auth_token = 123
+privilege_token = 12345678
+
+[ssh]
+type = tcp
+local_ip = 127.0.0.1
+local_port = 22

conf/frps_min.ini

@@ -0,0 +1,14 @@
+[common]
+bind_addr = 0.0.0.0
+bind_port = 7000
+vhost_http_port = 80
+vhost_https_port = 443
+dashboard_port = 7500
+privilege_mode = true
+privilege_token = 12345678
+
+[ssh]
+type = tcp
+auth_token = 123
+bind_addr = 0.0.0.0
+listen_port = 6000