From 6d4e5e38df844a3c79564d732cf90d45b502e76b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=A5=E6=B5=A9?= Date: Fri, 22 Dec 2023 17:19:59 +0800 Subject: [PATCH] 1719 --- .gitea/workflows/00-sync2gh.yml | 21 ++++++++++++++++++++ .gitea/workflows/docker-image.yml | 2 +- .github/workflows/docker-image.yml | 32 ++++++++++++++++++++++++++++++ README.md | 2 ++ 4 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 .gitea/workflows/00-sync2gh.yml create mode 100644 .github/workflows/docker-image.yml diff --git a/.gitea/workflows/00-sync2gh.yml b/.gitea/workflows/00-sync2gh.yml new file mode 100644 index 0000000..382479e --- /dev/null +++ b/.gitea/workflows/00-sync2gh.yml @@ -0,0 +1,21 @@ +name: Sync to GitHub + +on: + push: + branches: + - main + +jobs: + sync-to-github: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + persist-credentials: false + fetch-depth: 0 + + - name: Push to GitHub # https://github.com/yanhao98/frp-http + run: | + git remote set-url origin https://${{ secrets.GH_TOKEN_YH98 }}@github.com/yanhao98/frp-http.git + git push origin main diff --git a/.gitea/workflows/docker-image.yml b/.gitea/workflows/docker-image.yml index 19fc031..031959c 100644 --- a/.gitea/workflows/docker-image.yml +++ b/.gitea/workflows/docker-image.yml @@ -28,5 +28,5 @@ jobs: uses: docker/build-push-action@v5 with: push: true - tags: yanhao98/frp-http-server:latest + tags: ${{ secrets.DOCKERHUB_USERNAME }}/frp-http-server:latest platforms: linux/amd64,linux/arm64 diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml new file mode 100644 index 0000000..031959c --- /dev/null +++ b/.github/workflows/docker-image.yml @@ -0,0 +1,32 @@ +name: Build and Push Docker Image + +on: + push: + branches: + - main + +jobs: + build-and-push: + runs-on: ubuntu-latest + steps: + - name: Check Out Repo + uses: actions/checkout@v4 + + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Login to DockerHub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Build and Push + uses: docker/build-push-action@v5 + with: + push: true + tags: ${{ secrets.DOCKERHUB_USERNAME }}/frp-http-server:latest + platforms: linux/amd64,linux/arm64 diff --git a/README.md b/README.md index a68c2b0..9b16592 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,8 @@ bash <(curl -s domain.com/client.sh) --local=127.0.0.1:80 - https://github.com/snowdreamtech/frp/blob/master/frps/amd64/Dockerfile - [VBScript](https://www.w3school.com.cn/vbscript/index.asp) - https://stackoverflow.com/questions/4888197/how-To-show-dos-output-when-using-vbscript-exec/4888791#4888791 +- [Frps服务端一键配置脚本](https://github.com/MvsCode/frps-onekey) +- [frps-docker](https://github.com/cloverzrg/frps-docker/blob/master/Dockerfile) ``` rm /var/log/nginx/access.log /var/log/nginx/error.log