Browse Source

update v0.55.1 for frp

Stille 1 year ago
parent
commit
d135c5d243
2 changed files with 18 additions and 10 deletions
  1. 9 5
      frpc/Dockerfile
  2. 9 5
      frps/Dockerfile

+ 9 - 5
frpc/Dockerfile

@@ -1,7 +1,7 @@
 FROM alpine:3.8
 LABEL maintainer="Stille <[email protected]>"
 
-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

+ 9 - 5
frps/Dockerfile

@@ -1,7 +1,7 @@
 FROM alpine:3.8
 LABEL maintainer="Stille <[email protected]>"
 
-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