update v0.58.0

This reverts commit 9e6da70896.

.github/workflows/docker-build-release.yml

@@ -0,0 +1,72 @@
+name: "docker build release"
+
+on:
+  push:
+  workflow_dispatch:
+
+env:
+  PROJECT: frps
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2.3.5
+
+      - name: Set tag
+        id: tag
+        run: |
+          if [[ -n $(cat Dockerfile | awk '{if($1~"ENV" && $2=="VERSION")print $3}') ]]; then
+            VERSION=$(cat Dockerfile | awk '{if($1~"ENV" && $2=="VERSION")print $3}')
+            echo "tag=$VERSION" >> $GITHUB_ENV
+          else
+            echo "tag=$(date +%Y)-$(date +%m)-$(date +%d)" >> $GITHUB_ENV
+          fi
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login Docker Hub
+        uses: docker/login-action@v1 
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Build and push to docker hub
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            ${{ secrets.DOCKER_USERNAME }}/${{ env.PROJECT }}:latest
+            ${{ secrets.DOCKER_USERNAME }}/${{ env.PROJECT }}:${{ env.tag }}
+
+      - name: Sync README.md to Docker Hub
+        uses: ms-jpq/sync-dockerhub-readme@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          repository: ${{ secrets.DOCKER_USERNAME }}/${{ env.PROJECT }}
+          readme: "./README.md"
+
+      - name: Login harbor
+        uses: docker/login-action@v1 
+        with:
+          registry: ${{ secrets.HARBOR_REGISTRY }}
+          username: ${{ secrets.HARBOR_USERNAME }}
+          password: ${{ secrets.HARBOR_PASSWORD }}
+
+      - name: Build and push to harbor
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            ${{ secrets.HARBOR_REGISTRY }}/${{ secrets.HARBOR_USERNAME }}/${{ env.PROJECT }}:latest
+            ${{ secrets.HARBOR_REGISTRY }}/${{ secrets.HARBOR_USERNAME }}/${{ env.PROJECT }}:${{ env.tag }}

Dockerfile

@@ -1,18 +1,27 @@
 FROM alpine:3.8
-MAINTAINER Stille <stille@ioiox.com>
+LABEL maintainer="Stille <stille@ioiox.com>"
 
+ENV VERSION 0.58.0
+ENV TZ=Asia/Shanghai
 WORKDIR /
-ENV FRP_VERSION 0.34.0
 
-RUN set -x && \
-	wget --no-check-certificate https://github.com/fatedier/frp/releases/download/v${FRP_VERSION}/frp_${FRP_VERSION}_linux_amd64.tar.gz && \ 
-	tar xzf frp_${FRP_VERSION}_linux_amd64.tar.gz && \
-	cd frp_${FRP_VERSION}_linux_amd64 && \
-	mkdir /frp && \
-	mv frps frps.ini /frp && \
-	cd .. && \
-	rm -rf *.tar.gz frp_${FRP_VERSION}_linux_amd64
+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 ; \
+	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.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

README.md

@@ -4,20 +4,29 @@
 
 - GitHub [stilleshan/frps](https://github.com/stilleshan/frps)
 - Docker [stilleshan/frps](https://hub.docker.com/r/stilleshan/frps)
+> *docker image support for X86 and ARM*
 
-## 使用说明
-由于 frps 服务端需要配置参数,本脚本为原版 frps.ini ,安装完毕后请自行编辑 frps.ini 配置端口,密码等相关参数并重启服务.同时你也可以 fork 本仓库后自行修改 frps.ini ,在进行一键安装也非常方便.后期也可自行配置 frps.ini 和调整 frps 的版本.
+## 更新
+- **2024-02-25** 更新到新版本,支持 toml 配置文件.
+- **2021-05-31** 更新国内镜像方便使用
+- **2021-05-31** 更新 Linux 一键安装脚本同时支持 X86 和 ARM
+- **2021-05-29** 更新从`0.36.2`版本起 docker 镜像同时支持 X86 和 ARM
 
-### 一键脚本(先运行脚本,在自行修改 frps.ini 文件.)
+## 使用
+由于 frps 服务端需要配置参数,本脚本为原版 frps.toml ,安装完毕后请自行编辑 frps.toml 配置端口,密码等相关参数并重启服务.同时你也可以 fork 本仓库后自行修改 frps.toml ,在进行一键安装也非常方便.后期也可自行配置 frps.toml 和调整 frps 的版本.
+
+### 一键脚本(先执行脚本,在自行修改 frps.toml 文件.)
 安装
 ```shell
 wget https://raw.githubusercontent.com/stilleshan/frps/master/frps_linux_install.sh && chmod +x frps_linux_install.sh && ./frps_linux_install.sh
+# 以下为国内镜像
+wget https://github.ioiox.com/stilleshan/frps/raw/branch/master/frps_linux_install.sh && chmod +x frps_linux_install.sh && ./frps_linux_install.sh
 ```
 
 使用
 ```shell
-vi /usr/local/frp/frps.ini
-# 修改 frps.ini 配置
+vi /usr/local/frp/frps.toml
+# 修改 frps.toml 配置
 sudo systemctl restart frps
 # 重启 frps 服务即可生效
 ```
@@ -25,26 +34,28 @@ sudo systemctl restart frps
 卸载
 ```shell
 wget https://raw.githubusercontent.com/stilleshan/frps/master/frps_linux_uninstall.sh && chmod +x frps_linux_uninstall.sh && ./frps_linux_uninstall.sh
+# 以下为国内镜像
+wget https://github.ioiox.com/stilleshan/frps/raw/branch/master/frps_linux_uninstall.sh && chmod +x frps_linux_uninstall.sh && ./frps_linux_uninstall.sh
 ```
 
-
-### 自定义一键脚本(先 fork 本仓库,在自行修改 frps.ini 文件后运行脚本.)
+### 自定义一键脚本(先 fork 本仓库,在自行修改 frps.toml 文件后执行脚本.)
 - 首先 fork 本仓库
-- 配置 frps.ini
+- 配置 frps.toml
 - 修改 frps_linux_install.sh 脚本
-- 修改脚本链接并运行
+- 修改脚本链接
+- Push 仓库到 GitHub
 
 #### 修改 frps_linux_install.sh 脚本
-`FRP_VERSION="0.30.0"` 可根据原版项目更新自行修改为最新版本  
-`REPO="stilleshan/frps"` 由于 **fork** 到你自己的仓库,需修改`stilleshan`为你的GitHub账号ID.
+`FRP_VERSION=0.58.0` 可根据原版项目更新自行修改为最新版本.  
+`REPO=stilleshan/frps` 由于 **fork** 到你自己的仓库,需修改`stilleshan`为你的 GitHub 账号ID.
 
-#### 运行一键脚本
-修改以下脚本链接中的`stilleshan`为你的GitHub账号ID后,运行即可.
+#### 执行一键脚本
+修改以下脚本链接中的`stilleshan`为你的 GitHub 账号 ID 后,执行即可.
 ```shell
 wget https://raw.githubusercontent.com/stilleshan/frps/master/frps_linux_install.sh && chmod +x frps_linux_install.sh && ./frps_linux_install.sh
 ```
 #### 卸载脚本
-frps_linux_uninstall.sh 卸载脚本为通用脚本,可直接运行,也可同上方式修改链接后运行.
+frps_linux_uninstall.sh 卸载脚本为通用脚本,可直接执行,也可同上方式修改链接后执行.
 ```shell
 wget https://raw.githubusercontent.com/stilleshan/frps/master/frps_linux_uninstall.sh && chmod +x frps_linux_uninstall.sh && ./frps_linux_uninstall.sh
 ```
@@ -64,43 +75,38 @@ sudo systemctl stop frps
 ```
 
 ### docker 部署
-为避免因 **frps.ini** 文件的挂载,格式或者配置的错误导致容器无法正常运行并循环重启.请确保先配置好 **frps.ini** 后在运行启动.
+为避免因 **frps.toml** 文件的挂载,格式或者配置的错误导致容器无法正常运行并循环重启.请确保先配置好 **frps.toml** 后在执行启动.
 
-先 **git clone** 本仓库,并正确配置 **frps.ini** 文件.
+先 **git clone** 本仓库,并正确配置 **frps.toml** 文件.
 ```shell
-git clone https://github.com/stilleshan/frps.git
+git clone https://github.com/stilleshan/frps
 # git clone 本仓库
-vi /root/frps/frps.ini
-# 配置 frps.ini 文件
+git clone https://github.ioiox.com/stilleshan/frps
+# 国内镜像
+vi /root/frps/frps.toml
+# 配置 frps.toml 文件
 ```
-自行使用 **-p** 参数映射服务端所需端口,执行以下命令启动服务.
+启动容器
 ```shell
 docker run -d --name=frps --restart=always \
-    -v /root/frps/frps.ini:/frp/frps.ini  \
-    -p 80:80 \
-    -p 443:443 \
-    -p 7000:7000 \
-    -p 7500:7500 \
+    --network host \
+    -v /root/frps/frps.toml:/frp/frps.toml  \
     stilleshan/frps
 ```
-> 以上命令 -v 挂载的目录是以 git clone 本仓库为例,也可以在任意位置手动创建 frps.ini 文件,并修改命令中的挂载路径.
+> 以上命令 -v 挂载的目录是以 git clone 本仓库为例,也可以在任意位置手动创建 frps.toml 文件,并修改命令中的挂载路径.
 
-服务运行中修改 **frps.ini** 配置后需重启 **frps** 服务.
+服务运行中修改 **frps.toml** 配置后需重启 **frps** 服务.
 ```shell
-vi /root/frps/frps.ini
-# 修改 frps.ini 配置
+vi /root/frps/frps.toml
+# 修改 frps.toml 配置
 docker restart frps
 # 重启 frps 容器即可生效
 ```
 
-## 版本更新
-- latest 为最新版
-- Tags 为历史版本
-
-## 相关链接
-更多frp相关信息可参考我的博客
+## 链接
 - Blog [www.ioiox.com](https://www.ioiox.com)
 - GitHub [stilleshan/frps](https://github.com/stilleshan/frps)
-- Docker [stilleshan/frps](https://hub.docker.com/r/stilleshan/frps)
+- Docker Hub [stilleshan/frps](https://hub.docker.com/r/stilleshan/frps)
+- Docker [docker.ioiox.com](https://docker.ioiox.com)
 - 原版frp项目 [fatedier/frp](https://github.com/fatedier/frp)
 - [CentOS 7 安装配置frp内网穿透服务器端教程](https://www.ioiox.com/archives/5.html)

frps.ini

@@ -1,21 +0,0 @@
-[common]
-bind_addr = 0.0.0.0
-bind_port = 7000
-bind_udp_port = 7001
-kcp_bind_port = 7000
-vhost_http_port = 80
-vhost_https_port = 443
-dashboard_addr = 0.0.0.0
-dashboard_port = 7500
-dashboard_user = admin
-dashboard_pwd = admin
-log_file = ./frps.log
-log_level = info
-log_max_days = 3
-disable_log_color = false
-token = 12345678
-allow_ports = 2000-3000,3001,3003,4000-50000
-max_pool_count = 5
-max_ports_per_client = 0
-subdomain_host = frps.com
-tcp_mux = true

frps.service

@@ -7,7 +7,7 @@ Wants=network.target
 Type=simple
 Restart=on-failure
 RestartSec=5s
-ExecStart=/usr/local/frp/frps -c /usr/local/frp/frps.ini
+ExecStart=/usr/local/frp/frps -c /usr/local/frp/frps.toml
 
 [Install]
 WantedBy=multi-user.target

frps.toml

@@ -0,0 +1,35 @@
+bindAddr = "0.0.0.0"
+bindPort = 7000
+#kcpBindPort = 7000
+quicBindPort = 7000
+
+vhostHTTPPort = 80
+vhostHTTPSPort = 443
+
+transport.maxPoolCount = 2000
+transport.tcpMux = true
+transport.tcpMuxKeepaliveInterval = 60
+transport.tcpKeepalive = 7200
+transport.tls.force = false
+
+webServer.addr = "0.0.0.0"
+webServer.port = 7500
+webServer.user = "admin"
+webServer.password = "admin"
+webServer.pprofEnable = false
+
+log.to = "./frps.log"
+log.level = "info"
+log.maxDays = 3
+log.disablePrintColor = false
+
+auth.method = "token"
+auth.token = "12345678"
+
+allowPorts = [
+  { start = 10001, end = 50000 }
+]
+
+maxPortsPerClient = 8
+udpPacketSize = 1500
+natholeAnalysisDataReserveHours = 168

frps_linux_install.sh

@@ -1,28 +1,124 @@
-#!/bin/sh
-FRP_VERSION="0.33.0"
-REPO="stilleshan/frps"
-WORK_PATH=$(dirname $(readlink -f $0))
+#!/usr/bin/env bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+export PATH
 
-# 创建frp文件夹
-mkdir -p /usr/local/frp && \
-# 下载并移动frps文件
-wget -P ${WORK_PATH} https://github.com/fatedier/frp/releases/download/v${FRP_VERSION}/frp_${FRP_VERSION}_linux_amd64.tar.gz && \
-tar -zxvf frp_${FRP_VERSION}_linux_amd64.tar.gz && \
-cd frp_${FRP_VERSION}_linux_amd64 && \
-mv frps /usr/local/frp && \
-# 下载frps.in和frps.service
-wget -P /usr/local/frp https://raw.githubusercontent.com/${REPO}/master/frps.ini && \
-wget -P /lib/systemd/system https://raw.githubusercontent.com/${REPO}/master/frps.service && \
-systemctl daemon-reload && \
-# 启动frps
-sudo systemctl start frps && \
-sudo systemctl enable frps && \
-# 删除多余文件
-cd ${WORK_PATH} && \
-rm -rf frp_${FRP_VERSION}_linux_amd64 frp_${FRP_VERSION}_linux_amd64.tar.gz frps_linux_install.sh
-echo "=======================================================" &&\
-echo -e "\033[32m安装成功,请先修改 frps.ini 文件,确保格式及配置正确无误!\033[0m" && \
-echo -e "\033[31mvi /usr/local/frp/frps.ini \033[0m" && \
-echo -e "\033[32m修改完毕后执行以下命令重启服务:\033[0m" && \
-echo -e "\033[31msudo systemctl restart frps\033[0m" && \
-echo "======================================================="
+# fonts color
+Green="\033[32m"
+Red="\033[31m"
+Yellow="\033[33m"
+GreenBG="\033[42;37m"
+RedBG="\033[41;37m"
+Font="\033[0m"
+# fonts color
+
+# variable
+FRP_VERSION=0.58.0
+REPO=stilleshan/frps
+WORK_PATH=$(dirname $(readlink -f $0))
+FRP_NAME=frps
+FRP_PATH=/usr/local/frp
+PROXY_URL="https://mirror.ghproxy.com/"
+
+# check frps
+if [ -f "/usr/local/frp/${FRP_NAME}" ] || [ -f "/usr/local/frp/${FRP_NAME}.toml" ] || [ -f "/lib/systemd/system/${FRP_NAME}.service" ];then
+    echo -e "${Green}=========================================================================${Font}"
+    echo -e "${RedBG}当前已退出脚本.${Font}"
+    echo -e "${Green}检查到服务器已安装${Font} ${Red}${FRP_NAME}${Font}"
+    echo -e "${Green}请手动确认和删除${Font} ${Red}/usr/local/frp/${Font} ${Green}目录下的${Font} ${Red}${FRP_NAME}${Font} ${Green}和${Font} ${Red}/${FRP_NAME}.toml${Font} ${Green}文件以及${Font} ${Red}/lib/systemd/system/${FRP_NAME}.service${Font} ${Green}文件,再次执行本脚本.${Font}"
+    echo -e "${Green}参考命令如下:${Font}"
+    echo -e "${Red}rm -rf /usr/local/frp/${FRP_NAME}${Font}"
+    echo -e "${Red}rm -rf /usr/local/frp/${FRP_NAME}.toml${Font}"
+    echo -e "${Red}rm -rf /lib/systemd/system/${FRP_NAME}.service${Font}"
+    echo -e "${Green}=========================================================================${Font}"
+    exit 2
+fi
+
+while ! test -z "$(ps -A | grep -w ${FRP_NAME})"; do
+    FRPSPID=$(ps -A | grep -w ${FRP_NAME} | awk 'NR==1 {print $1}')
+    kill -9 $FRPSPID
+done
+
+# check pkg
+if type apt-get >/dev/null 2>&1 ; then
+    if ! type wget >/dev/null 2>&1 ; then
+        apt-get install wget -y
+    fi
+    if ! type curl >/dev/null 2>&1 ; then
+        apt-get install curl -y
+    fi
+fi
+
+if type yum >/dev/null 2>&1 ; then
+    if ! type wget >/dev/null 2>&1 ; then
+        yum install wget -y
+    fi
+    if ! type curl >/dev/null 2>&1 ; then
+        yum install curl -y
+    fi
+fi
+
+# check network
+GOOGLE_HTTP_CODE=$(curl -o /dev/null --connect-timeout 5 --max-time 8 -s --head -w "%{http_code}" "https://www.google.com")
+PROXY_HTTP_CODE=$(curl -o /dev/null --connect-timeout 5 --max-time 8 -s --head -w "%{http_code}" "${PROXY_URL}")
+
+# check arch
+if [ $(uname -m) = "x86_64" ]; then
+    PLATFORM=amd64
+fi
+
+if [ $(uname -m) = "aarch64" ]; then
+    PLATFORM=arm64
+fi
+
+FILE_NAME=frp_${FRP_VERSION}_linux_${PLATFORM}
+
+# download
+if [ $GOOGLE_HTTP_CODE == "200" ]; then
+    wget -P ${WORK_PATH} https://github.com/fatedier/frp/releases/download/v${FRP_VERSION}/${FILE_NAME}.tar.gz -O ${FILE_NAME}.tar.gz
+    wget -P ${WORK_PATH} https://raw.githubusercontent.com/${REPO}/master/${FRP_NAME}.toml -O ${FRP_NAME}.toml
+else
+    if [ $PROXY_HTTP_CODE == "200" ]; then
+        wget -P ${WORK_PATH} ${PROXY_URL}https://github.com/fatedier/frp/releases/download/v${FRP_VERSION}/${FILE_NAME}.tar.gz -O ${FILE_NAME}.tar.gz
+        wget -P ${WORK_PATH} ${PROXY_URL}https://raw.githubusercontent.com/${REPO}/master/${FRP_NAME}.toml -O ${FRP_NAME}.toml
+    else
+        echo -e "${Red}检测 GitHub Proxy 代理失效 开始使用官方地址下载${Font}"
+        wget -P ${WORK_PATH} https://github.com/fatedier/frp/releases/download/v${FRP_VERSION}/${FILE_NAME}.tar.gz -O ${FILE_NAME}.tar.gz
+        wget -P ${WORK_PATH} https://raw.githubusercontent.com/${REPO}/master/${FRP_NAME}.toml -O ${FRP_NAME}.toml
+    fi
+fi
+tar -zxvf ${FILE_NAME}.tar.gz
+mkdir -p ${FRP_PATH}
+mv ${FILE_NAME}/${FRP_NAME} ${FRP_PATH}
+mv ${FRP_NAME}.toml ${FRP_PATH}
+
+# 配置 frps.service
+cat >/lib/systemd/system/frps.service <<'EOF'
+[Unit]
+Description=Frp Server Service
+After=network.target syslog.target
+Wants=network.target
+
+[Service]
+Type=simple
+Restart=on-failure
+RestartSec=5s
+ExecStart=/usr/local/frp/frps -c /usr/local/frp/frps.toml
+
+[Install]
+WantedBy=multi-user.target
+
+EOF
+
+systemctl daemon-reload
+sudo systemctl start ${FRP_NAME}
+sudo systemctl enable ${FRP_NAME}
+
+# clean
+rm -rf ${WORK_PATH}/${FILE_NAME}.tar.gz ${WORK_PATH}/${FILE_NAME} ${FRP_NAME}_linux_install.sh
+
+echo -e "${Green}====================================================================${Font}"
+echo -e "${Green}安装成功,请先修改 ${FRP_NAME}.toml 文件,确保格式及配置正确无误!${Font}"
+echo -e "${Red}vi /usr/local/frp/${FRP_NAME}.toml${Font}"
+echo -e "${Green}修改完毕后执行以下命令重启服务:${Font}"
+echo -e "${Red}sudo systemctl restart ${FRP_NAME}${Font}"
+echo -e "${Green}====================================================================${Font}"

frps_linux_uninstall.sh

@@ -1,13 +1,33 @@
-#!/bin/sh
-# 停止frps
-sudo systemctl stop frps && \
-# 删除frps
-rm -rf /usr/local/frp && \
-# 删除frps.service
-rm -rf /lib/systemd/system/frps.service && \
-sudo systemctl daemon-reload && \
+#!/usr/bin/env bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+export PATH
+
+# fonts color
+Green="\033[32m"
+Red="\033[31m"
+Yellow="\033[33m"
+GreenBG="\033[42;37m"
+RedBG="\033[41;37m"
+Font="\033[0m"
+# fonts color
+
+# variable
+WORK_PATH=$(dirname $(readlink -f $0))
+FRP_NAME=frps
+FRP_VERSION=0.58.0
+FRP_PATH=/usr/local/frp
+
+# 停止frpc
+sudo systemctl stop ${FRP_NAME}
+sudo systemctl disable ${FRP_NAME}
+# 删除frpc
+rm -rf ${FRP_PATH}
+# 删除frpc.service
+rm -rf /lib/systemd/system/${FRP_NAME}.service
+sudo systemctl daemon-reload
 # 删除本文件
-rm -rf frps_linux_uninstall.sh
-echo "============================" &&\
-echo -e "\033[32m卸载成功,相关文件已清理完毕!\033[0m" && \
-echo "============================"
+rm -rf ${FRP_NAME}_linux_uninstall.sh
+
+echo -e "${Green}============================${Font}"
+echo -e "${Green}卸载成功,相关文件已清理完毕!${Font}"
+echo -e "${Green}============================${Font}"