mod for kcp

yangxuan8282 · Jun 24, 2017 · 1851752 · 1851752
1 parent fd66f5f
commit 1851752
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 10 deletions.
diff --git a/frpc/amd64/Dockerfile b/frpc/amd64/Dockerfile
@@ -1,7 +1,7 @@
 FROM nimmis/alpine:3.3
 MAINTAINER Yangxuan <[email protected]>
 
-ENV FRP_VERSION=0.11.0
+ENV FRP_VERSION=0.12.0
 
 RUN apk --no-cache --update add curl \
  && mkdir -p /tmp/frp \
@@ -20,6 +20,8 @@ ADD etc /etc
 
 ENV FRP_SERVER_IP=127.0.0.1 \
     FRP_SERVER_PORT=7000 \
+    FRP_KCP_PORT=7000 \
+    FRP_PROTOCOL=tcp \
     PRIVILEGE_TOKEN=youcanusefrpwithDocker \
     FRP_TYPE=http \
     IF_USE_ENCRYPTION=true \

diff --git a/frpc/amd64/docker-compose.yml b/frpc/amd64/docker-compose.yml
@@ -11,6 +11,7 @@ services:
     environment:
       - FRP_SERVER_IP=YOUR_FRP_SERVER_IP_HERE
       - PRIVILEGE_TOKEN=TOKEN_HERE
+      #- FRP_PROTOCOL=kcp
 
 networks:
   default:

diff --git a/frpc/amd64/etc/frp/frpc.ini b/frpc/amd64/etc/frp/frpc.ini
@@ -3,6 +3,7 @@
 server_addr = $FRP_SERVER_IP
 server_port = $FRP_SERVER_PORT
 privilege_token = $PRIVILEGE_TOKEN
+protocol = $FRP_PROTOCOL
 
 [frp_dashboard]
 type = http

diff --git a/frpc/amd64/etc/frp/frpc.tmpl b/frpc/amd64/etc/frp/frpc.tmpl
@@ -2,6 +2,7 @@
 server_addr = {{ .Env.FRP_SERVER_IP }}
 server_port = {{ .Env.FRP_SERVER_PORT }}
 privilege_token = {{ .Env.PRIVILEGE_TOKEN }}
+protocol = {{ .Env.FRP_PROTOCOL }}
 
 # uncomment this block to visit frp dashboard, and you need pass ENV when start container
 # [frp_dashboard]

diff --git a/frpc/armhf/Dockerfile b/frpc/armhf/Dockerfile
@@ -1,7 +1,7 @@
 FROM pipill/armhf-nimmis-alpine:3.3
 MAINTAINER Yangxuan <[email protected]>
 
-ENV FRP_VERSION=0.11.0
+ENV FRP_VERSION=0.12.0
 
 RUN [ "cross-build-start" ]
 
@@ -24,6 +24,8 @@ ADD etc /etc
 
 ENV FRP_SERVER_IP=127.0.0.1 \
     FRP_SERVER_PORT=7000 \
+    FRP_KCP_PORT=7000 \
+    FRP_PROTOCOL=tcp \
     PRIVILEGE_TOKEN=youcanusefrpwithDocker \
     FRP_TYPE=http \
     IF_USE_ENCRYPTION=true \

diff --git a/frpc/armhf/docker-compose.yml b/frpc/armhf/docker-compose.yml
@@ -11,6 +11,7 @@ services:
     environment:
       - FRP_SERVER_IP=YOUR_FRP_SERVER_IP_HERE
       - PRIVILEGE_TOKEN=TOKEN_HERE
+      #- FRP_PROTOCOL=kcp
 
 networks:
   default:

diff --git a/frpc/armhf/etc/frp/frpc.ini b/frpc/armhf/etc/frp/frpc.ini
@@ -3,6 +3,7 @@
 server_addr = $FRP_SERVER_IP
 server_port = $FRP_SERVER_PORT
 privilege_token = $PRIVILEGE_TOKEN
+protocol = $FRP_PROTOCOL
 
 [frp_dashboard]
 type = http

diff --git a/frpc/armhf/etc/frp/frpc.tmpl b/frpc/armhf/etc/frp/frpc.tmpl
@@ -2,6 +2,7 @@
 server_addr = {{ .Env.FRP_SERVER_IP }}
 server_port = {{ .Env.FRP_SERVER_PORT }}
 privilege_token = {{ .Env.PRIVILEGE_TOKEN }}
+protocol = {{ .Env.FRP_PROTOCOL }}
 
 # uncomment this block to visit frp dashboard, and you need pass ENV when start container
 # [frp_dashboard]

diff --git a/frps/Dockerfile b/frps/Dockerfile
@@ -8,6 +8,7 @@ COPY frps run_frps /usr/bin/
 EXPOSE 80 7000 7500
 
 ENV BIND_PORT="7000" \
+    KCP_BIND_PORT="7000" \
     VHOST_HTTP_PORT="80" \
     PRIVILEGE_TOKEN="youcanusefrpwithDocker" \
     FRP_DASHBOARD_PORT="7500" \

diff --git a/frps/docker-compose.yml b/frps/docker-compose.yml
@@ -8,6 +8,7 @@ services:
     ports:
       - "80:80"
       - "7000:7000"
+      #- "7000:7000/udp"
       - "7500:7500"
 
     environment:

diff --git a/frps/frps b/frps/frps
diff --git a/frps/frps.ini.default b/frps/frps.ini.default
diff --git a/frps/run_frps b/frps/run_frps
@@ -6,6 +6,7 @@ if ! [ -f /etc/frp/frps.ini ]; then
 echo "# frps.ini
 [common]
 bind_port = $BIND_PORT
+kcp_bind_port = $KCP_BIND_PORT
 vhost_http_port = $VHOST_HTTP_PORT
 privilege_token = $PRIVILEGE_TOKEN
 dashboard_port = $FRP_DASHBOARD_PORT