diff --git a/frp/Dockerfile b/frp/Dockerfile index 6994960..55751e6 100644 --- a/frp/Dockerfile +++ b/frp/Dockerfile @@ -5,7 +5,7 @@ FROM alpine:3 MAINTAINER EasyPi Software Foundation -ENV FRP_VERSION=0.36.2 +ENV FRP_VERSION=0.37.1 ENV FRP_FILE=frp_${FRP_VERSION}_linux_amd64.tar.gz ENV FRP_URL=https://github.com/fatedier/frp/releases/download/v${FRP_VERSION}/${FRP_FILE} diff --git a/frp/README.md b/frp/README.md index 3c74b4e..12eeb63 100644 --- a/frp/README.md +++ b/frp/README.md @@ -6,16 +6,14 @@ or firewall to the internet. Now, it supports tcp, udp, http and https protocol when requests can be forwarded by domains to backward web services. ```yaml -frps: - image: vimagick/frp - ports: - - "7000:7000/tcp" - - "7000:7000/udp" - - "7500:7500/tcp" - - "127.0.0.1:20000-20099:20000-20099/tcp" - volumes: - - ./data/frps.ini:/opt/frp/frps.ini - restart: always +version: "3.8" +services: + frps: + image: vimagick/frp + volumes: + - ./data/frps.ini:/opt/frp/frps.ini + network_mode: host + restart: unless-stopped ``` Sample config file: [frps.ini][2] diff --git a/frp/arm/Dockerfile b/frp/arm/Dockerfile index 352fe3c..ffae249 100644 --- a/frp/arm/Dockerfile +++ b/frp/arm/Dockerfile @@ -2,10 +2,10 @@ # Dockerfile for frp-arm # -FROM arm32v7/alpine:3 +FROM alpine:3 MAINTAINER EasyPi Software Foundation -ENV FRP_VERSION=0.36.2 +ENV FRP_VERSION=0.37.1 ENV FRP_FILE=frp_${FRP_VERSION}_linux_arm.tar.gz ENV FRP_URL=https://github.com/fatedier/frp/releases/download/v${FRP_VERSION}/${FRP_FILE} diff --git a/frp/arm/docker-compose.yml b/frp/arm/docker-compose.yml index 6e673ed..2b5713f 100644 --- a/frp/arm/docker-compose.yml +++ b/frp/arm/docker-compose.yml @@ -1,7 +1,9 @@ -frpc: - image: easypi/frp-arm - command: ./frpc -c frpc.ini - volumes: - - ./data/frpc.ini:/opt/frp/frpc.ini - net: host - restart: unless-stopped +version: "3.8" +services: + frpc: + image: easypi/frp-arm + command: ./frpc -c frpc.ini + volumes: + - ./data/frpc.ini:/opt/frp/frpc.ini + network_mode: host + restart: unless-stopped diff --git a/frp/docker-compose.yml b/frp/docker-compose.yml index 134ad50..6cd522a 100644 --- a/frp/docker-compose.yml +++ b/frp/docker-compose.yml @@ -1,10 +1,8 @@ -frps: - image: vimagick/frp - ports: - - "7000:7000/tcp" - - "7000:7000/udp" - - "7500:7500/tcp" - - "127.0.0.1:20000-20099:20000-20099/tcp" - volumes: - - ./data/frps.ini:/opt/frp/frps.ini - restart: always +version: "3.8" +services: + frps: + image: vimagick/frp + volumes: + - ./data/frps.ini:/opt/frp/frps.ini + network_mode: host + restart: unless-stopped