diff --git a/.github/workflows/build-and-push-image.yml b/.github/workflows/build-and-push-image.yml index c6caff6c..425f7e39 100644 --- a/.github/workflows/build-and-push-image.yml +++ b/.github/workflows/build-and-push-image.yml @@ -19,15 +19,15 @@ jobs: steps: # environment - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: fetch-depth: '0' - name: Set up QEMU - uses: docker/setup-qemu-action@v3 + uses: docker/setup-qemu-action@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v4 # get image tag name - name: Get Image Tag Name @@ -38,13 +38,13 @@ jobs: echo "TAG_NAME=${{ github.event.inputs.tag }}" >> $GITHUB_ENV fi - name: Login to DockerHub - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_PASSWORD }} - name: Login to the GPR - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: registry: ghcr.io username: ${{ github.repository_owner }} @@ -61,7 +61,7 @@ jobs: echo "TAG_FRPS_GPR=ghcr.io/fatedier/frps:${{ env.TAG_NAME }}" >> $GITHUB_ENV - name: Build and push frpc - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v7 with: context: . file: ./dockerfiles/Dockerfile-for-frpc @@ -72,7 +72,7 @@ jobs: ${{ env.TAG_FRPC_GPR }} - name: Build and push frps - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v7 with: context: . file: ./dockerfiles/Dockerfile-for-frps diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 4e42f0fe..35cb5f65 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -14,12 +14,12 @@ jobs: name: lint runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - uses: actions/setup-go@v5 + - uses: actions/checkout@v6 + - uses: actions/setup-go@v6 with: go-version: '1.25' cache: false - - uses: actions/setup-node@v4 + - uses: actions/setup-node@v6 with: node-version: '22' - name: Build web assets (frps) diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml index ebc0dca9..5f3f156f 100644 --- a/.github/workflows/goreleaser.yml +++ b/.github/workflows/goreleaser.yml @@ -8,15 +8,15 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: fetch-depth: 0 - name: Set up Go - uses: actions/setup-go@v5 + uses: actions/setup-go@v6 with: go-version: '1.25' - - uses: actions/setup-node@v4 + - uses: actions/setup-node@v6 with: node-version: '22' - name: Build web assets (frps) @@ -30,7 +30,7 @@ jobs: ./package.sh - name: Run GoReleaser - uses: goreleaser/goreleaser-action@v6 + uses: goreleaser/goreleaser-action@v7 with: version: latest args: release --clean --release-notes=./Release.md diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 8f10d641..8960807b 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -19,7 +19,7 @@ jobs: actions: write runs-on: ubuntu-latest steps: - - uses: actions/stale@v9 + - uses: actions/stale@v10 with: stale-issue-message: 'Issues go stale after 14d of inactivity. Stale issues rot after an additional 3d of inactivity and eventually close.' stale-pr-message: "PRs go stale after 14d of inactivity. Stale PRs rot after an additional 3d of inactivity and eventually close." diff --git a/dockerfiles/Dockerfile-for-frpc b/dockerfiles/Dockerfile-for-frpc index 881b0cc2..6760bb16 100644 --- a/dockerfiles/Dockerfile-for-frpc +++ b/dockerfiles/Dockerfile-for-frpc @@ -1,8 +1,11 @@ FROM node:22 AS web-builder -WORKDIR /web/frpc -COPY web/frpc/ ./ +COPY web/package.json /web/package.json +COPY web/shared/ /web/shared/ +COPY web/frpc/ /web/frpc/ +WORKDIR /web RUN npm install +WORKDIR /web/frpc RUN npm run build FROM golang:1.25 AS building diff --git a/dockerfiles/Dockerfile-for-frps b/dockerfiles/Dockerfile-for-frps index 3df253e2..8ef7dff4 100644 --- a/dockerfiles/Dockerfile-for-frps +++ b/dockerfiles/Dockerfile-for-frps @@ -1,8 +1,11 @@ FROM node:22 AS web-builder -WORKDIR /web/frps -COPY web/frps/ ./ +COPY web/package.json /web/package.json +COPY web/shared/ /web/shared/ +COPY web/frps/ /web/frps/ +WORKDIR /web RUN npm install +WORKDIR /web/frps RUN npm run build FROM golang:1.25 AS building