diff --git a/.gitea/workflows/00-sync2gh.yml b/.gitea/workflows/00-sync2gh.yml deleted file mode 100644 index 382479e..0000000 --- a/.gitea/workflows/00-sync2gh.yml +++ /dev/null @@ -1,21 +0,0 @@ -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 deleted file mode 100644 index 031959c..0000000 --- a/.gitea/workflows/docker-image.yml +++ /dev/null @@ -1,32 +0,0 @@ -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/.github/dependabot.yml b/.github/dependabot.yml index 6867e71..244c767 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,3 +9,7 @@ updates: directory: "/" schedule: interval: "weekly" + - package-ecosystem: "docker" + directory: "/" + schedule: + interval: "daily" diff --git a/Dockerfile b/Dockerfile index 098f11f..21e07cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ -FROM nginx:1-bookworm +FROM nginx:1.25.4-bookworm +FROM fatedier/frps:v0.54.0 as frps ARG DEBIAN_FRONTEND='noninteractive' ARG S6_OVERLAY_VERSION=3.1.6.2 @@ -9,7 +10,8 @@ RUN set -x && \ curl --fail ${S6_OVERLAY_BASE_URL}/v${S6_OVERLAY_VERSION}/s6-overlay-`uname -m| sed 's/armv7l/armhf/g'`.tar.xz -SLo- | tar -C / -Jxpf - && \ apt-get purge -y --auto-remove xz-utils -COPY --from=fatedier/frps:v0.54.0 /usr/bin/frps /usr/bin/frps +# COPY --from=fatedier/frps:v0.54.0 /usr/bin/frps /usr/bin/frps +COPY --from=frps /usr/bin/frps /usr/bin/frps COPY rootfs/ / COPY rootfs-s6-rc/ / @@ -23,4 +25,4 @@ RUN set -x && \ STOPSIGNAL SIGTERM ENTRYPOINT ["/init"] -EXPOSE 80 7000 \ No newline at end of file +EXPOSE 80 7000