From 6029db3d9f7f99eb61d61ce3fe8bbb66d7db4c3c Mon Sep 17 00:00:00 2001 From: kev Date: Mon, 19 Dec 2022 17:10:08 +0800 Subject: [PATCH] update frp --- frp/Dockerfile | 6 +++--- frp/README.md | 2 +- frp/docker-compose.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frp/Dockerfile b/frp/Dockerfile index 2dd4ed1..04ae1db 100644 --- a/frp/Dockerfile +++ b/frp/Dockerfile @@ -14,9 +14,9 @@ WORKDIR /opt/frp RUN set -xe \ && apk add --no-cache curl tar \ - && curl -sSL $FRP_URL | tar xz --strip 1 \ - && apk del curl tar + && mkdir -p bin etc \ + && curl -sSL ${FRP_URL} | tar xz --strip 1 -C bin EXPOSE 7000/tcp 7000/udp 7500/tcp -CMD ["./frps", "-c", "frps.ini"] +CMD ["./bin/frps", "-c", "./etc/frps.ini"] diff --git a/frp/README.md b/frp/README.md index 36fb799..4338a69 100644 --- a/frp/README.md +++ b/frp/README.md @@ -11,7 +11,7 @@ services: frps: image: vimagick/frp volumes: - - ./data/frps.ini:/opt/frp/frps.ini + - ./data:/opt/frp/etc healthcheck: test: ["CMD", "curl", "-f", "-u", "admin:admin", "http://127.0.0.1:7500/healthz"] interval: 1m diff --git a/frp/docker-compose.yml b/frp/docker-compose.yml index 266e1fb..2aaac93 100644 --- a/frp/docker-compose.yml +++ b/frp/docker-compose.yml @@ -3,7 +3,7 @@ services: frps: image: vimagick/frp volumes: - - ./data/frps.ini:/opt/frp/frps.ini + - ./data:/opt/frp/etc healthcheck: test: ["CMD", "curl", "-f", "-u", "admin:admin", "http://127.0.0.1:7500/healthz"] interval: 1m