diff --git a/frpc/Dockerfile b/frpc/Dockerfile index 59a2279..e6efee1 100644 --- a/frpc/Dockerfile +++ b/frpc/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.8 LABEL maintainer="Stille " -ENV VERSION 0.51.3 +ENV VERSION 0.55.1 ENV TZ=Asia/Shanghai WORKDIR / @@ -9,15 +9,19 @@ RUN apk add --no-cache tzdata \ && ln -snf /usr/share/zoneinfo/${TZ} /etc/localtime \ && echo ${TZ} > /etc/timezone -RUN if [ "$(uname -m)" = "x86_64" ]; then export PLATFORM=amd64 ; else if [ "$(uname -m)" = "aarch64" ]; then export PLATFORM=arm64 ; fi fi \ - && wget --no-check-certificate https://github.com/fatedier/frp/releases/download/v${VERSION}/frp_${VERSION}_linux_${PLATFORM}.tar.gz \ +RUN if [ "$(uname -m)" = "x86_64" ]; then export PLATFORM=amd64 ; \ + elif [ "$(uname -m)" = "aarch64" ]; then export PLATFORM=arm64 ; \ + elif [ "$(uname -m)" = "armv7" ]; then export PLATFORM=arm ; \ + elif [ "$(uname -m)" = "armv7l" ]; then export PLATFORM=arm ; \ + elif [ "$(uname -m)" = "armhf" ]; then export PLATFORM=arm ; fi \ + && wget --no-check-certificate https://github.com/fatedier/frp/releases/download/v${VERSION}/frp_${VERSION}_linux_${PLATFORM}.tar.gz \ && tar xzf frp_${VERSION}_linux_${PLATFORM}.tar.gz \ && cd frp_${VERSION}_linux_${PLATFORM} \ && mkdir /frp \ - && mv frpc frpc.ini /frp \ + && mv frpc frpc.toml /frp \ && cd .. \ && rm -rf *.tar.gz frp_${VERSION}_linux_${PLATFORM} VOLUME /frp -CMD /frp/frpc -c /frp/frpc.ini +CMD /frp/frpc -c /frp/frpc.toml diff --git a/frps/Dockerfile b/frps/Dockerfile index ef142b2..de990a3 100644 --- a/frps/Dockerfile +++ b/frps/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.8 LABEL maintainer="Stille " -ENV VERSION 0.51.3 +ENV VERSION 0.55.1 ENV TZ=Asia/Shanghai WORKDIR / @@ -9,15 +9,19 @@ RUN apk add --no-cache tzdata \ && ln -snf /usr/share/zoneinfo/${TZ} /etc/localtime \ && echo ${TZ} > /etc/timezone -RUN if [ "$(uname -m)" = "x86_64" ]; then export PLATFORM=amd64 ; else if [ "$(uname -m)" = "aarch64" ]; then export PLATFORM=arm64 ; fi fi \ - && wget --no-check-certificate https://github.com/fatedier/frp/releases/download/v${VERSION}/frp_${VERSION}_linux_${PLATFORM}.tar.gz \ +RUN if [ "$(uname -m)" = "x86_64" ]; then export PLATFORM=amd64 ; \ + elif [ "$(uname -m)" = "aarch64" ]; then export PLATFORM=arm64 ; \ + elif [ "$(uname -m)" = "armv7" ]; then export PLATFORM=arm ; \ + elif [ "$(uname -m)" = "armv7l" ]; then export PLATFORM=arm ; \ + elif [ "$(uname -m)" = "armhf" ]; then export PLATFORM=arm ; fi \ + && wget --no-check-certificate https://github.com/fatedier/frp/releases/download/v${VERSION}/frp_${VERSION}_linux_${PLATFORM}.tar.gz \ && tar xzf frp_${VERSION}_linux_${PLATFORM}.tar.gz \ && cd frp_${VERSION}_linux_${PLATFORM} \ && mkdir /frp \ - && mv frps frps.ini /frp \ + && mv frps frps.toml /frp \ && cd .. \ && rm -rf *.tar.gz frp_${VERSION}_linux_${PLATFORM} VOLUME /frp -CMD /frp/frps -c /frp/frps.ini +CMD /frp/frps -c /frp/frps.toml