From 46eb7659a11374faa6942b853313d2e6bb503688 Mon Sep 17 00:00:00 2001 From: kev Date: Mon, 21 Oct 2019 08:55:22 +0800 Subject: [PATCH] upgrade frpc to 0.29.0 --- frp/Dockerfile | 2 +- frp/arm/Dockerfile | 4 ++-- frp/arm/docker-compose.yml | 7 ++++--- frp/data/frpc.ini | 3 ++- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/frp/Dockerfile b/frp/Dockerfile index 548e9c0..5d274f8 100644 --- a/frp/Dockerfile +++ b/frp/Dockerfile @@ -5,7 +5,7 @@ FROM alpine MAINTAINER kev -ENV FRP_VERSION 0.21.0 +ENV FRP_VERSION 0.29.0 ENV FRP_URL https://github.com/fatedier/frp/releases/download/v${FRP_VERSION}/frp_${FRP_VERSION}_linux_amd64.tar.gz WORKDIR /opt/frp diff --git a/frp/arm/Dockerfile b/frp/arm/Dockerfile index 302ad9e..2ee4289 100644 --- a/frp/arm/Dockerfile +++ b/frp/arm/Dockerfile @@ -2,10 +2,10 @@ # Dockerfile for frp-arm # -FROM alpine +FROM arm32v7/alpine:3 MAINTAINER EasyPi Software Foundation -ENV FRP_VERSION 0.21.0 +ENV FRP_VERSION 0.29.0 ENV FRP_URL https://github.com/fatedier/frp/releases/download/v${FRP_VERSION}/frp_${FRP_VERSION}_linux_arm.tar.gz WORKDIR /opt/frp diff --git a/frp/arm/docker-compose.yml b/frp/arm/docker-compose.yml index 14b98dd..6e673ed 100644 --- a/frp/arm/docker-compose.yml +++ b/frp/arm/docker-compose.yml @@ -1,6 +1,7 @@ -frps: +frpc: image: easypi/frp-arm + command: ./frpc -c frpc.ini volumes: - - ./data/frps.ini:/opt/frp/frps.ini + - ./data/frpc.ini:/opt/frp/frpc.ini net: host - restart: always + restart: unless-stopped diff --git a/frp/data/frpc.ini b/frp/data/frpc.ini index 08c0404..a975ab9 100644 --- a/frp/data/frpc.ini +++ b/frp/data/frpc.ini @@ -2,7 +2,8 @@ server_addr = 1.2.3.4 server_port = 7000 protocol = kcp -privilege_token = 12345678 +token = 12345678 +admin_port = 7400 [ssh] type = tcp