From e14b9fdf899edb6de1dac1dd019c127dd3db1403 Mon Sep 17 00:00:00 2001 From: neil Date: Tue, 17 Mar 2026 20:56:26 +0800 Subject: [PATCH 1/4] fix --- updatessl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/updatessl.sh b/updatessl.sh index 1756722..7f27047 100644 --- a/updatessl.sh +++ b/updatessl.sh @@ -16,7 +16,7 @@ updatessl() { for d_list in $(grep ACME_DOMAINS $DEFAULT_CONF | cut -d ' ' -f 2); do d=$(echo "$d_list" | cut -d , -f 1) - $ACME_BIN --issue --server letsencrypt --ocsp -k ec-256 \ + $ACME_BIN --issue --server letsencrypt -k ec-256 \ -d $d_list \ --nginx \ --fullchain-file "$CERTS/$d.crt" \ From 8b9508960154f3e52a3a7bc29551a1bcd97fa478 Mon Sep 17 00:00:00 2001 From: neil Date: Tue, 17 Mar 2026 21:05:15 +0800 Subject: [PATCH 2/4] fix --- .github/workflows/dockerhub.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml index e780c94..4f09af6 100644 --- a/.github/workflows/dockerhub.yml +++ b/.github/workflows/dockerhub.yml @@ -13,13 +13,13 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v6 with: fetch-depth: 0 - name: Get Docker tags for Debian based image id: docker_meta_debian - uses: crazy-max/ghaction-docker-meta@v2 + uses: docker/metadata-action@v5 with: images: | neilpang/letsproxy @@ -28,20 +28,20 @@ jobs: type=semver,pattern={{major}}.{{minor}} type=raw,value=latest,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }} - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v3 - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push the Debian based image id: docker_build_debian - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v6 with: file: Dockerfile platforms: linux/amd64,linux/arm64,linux/arm/v7 @@ -57,13 +57,13 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v6 with: fetch-depth: 0 - name: Get Docker tags for Alpine based image id: docker_meta_alpine - uses: crazy-max/ghaction-docker-meta@v2 + uses: docker/metadata-action@v5 with: images: | neilpang/letsproxy @@ -74,20 +74,20 @@ jobs: flavor: latest=false - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v3 - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push the Alpine based image id: docker_build_alpine - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v6 with: file: Dockerfile.alpine platforms: linux/amd64,linux/arm64,linux/arm/v7 From 6843ce067807a4be6054ed93d681b303c982b25d Mon Sep 17 00:00:00 2001 From: neil Date: Tue, 17 Mar 2026 21:08:02 +0800 Subject: [PATCH 3/4] fix --- .github/workflows/dockerhub.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml index 4f09af6..ddc63f2 100644 --- a/.github/workflows/dockerhub.yml +++ b/.github/workflows/dockerhub.yml @@ -45,7 +45,7 @@ jobs: with: file: Dockerfile platforms: linux/amd64,linux/arm64,linux/arm/v7 - push: true + push: ${{ steps.docker_meta_debian.outputs.tags != '' }} tags: ${{ steps.docker_meta_debian.outputs.tags }} labels: ${{ steps.docker_meta_debian.outputs.labels }} @@ -91,7 +91,7 @@ jobs: with: file: Dockerfile.alpine platforms: linux/amd64,linux/arm64,linux/arm/v7 - push: true + push: ${{ steps.docker_meta_alpine.outputs.tags != '' }} tags: ${{ steps.docker_meta_alpine.outputs.tags }} labels: ${{ steps.docker_meta_alpine.outputs.labels }} From b282f5a807480333295cd16327d5960b6315afb5 Mon Sep 17 00:00:00 2001 From: neil Date: Tue, 17 Mar 2026 21:11:38 +0800 Subject: [PATCH 4/4] fix --- .github/workflows/dockerhub.yml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml index ddc63f2..a9c744a 100644 --- a/.github/workflows/dockerhub.yml +++ b/.github/workflows/dockerhub.yml @@ -3,9 +3,7 @@ name: DockerHub on: push: branches: - - '*' - tags: - - '*' + - '**' jobs: multiarch-build-debian: @@ -24,9 +22,9 @@ jobs: images: | neilpang/letsproxy tags: | - type=semver,pattern={{version}} - type=semver,pattern={{major}}.{{minor}} - type=raw,value=latest,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }} + type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }} + type=ref,event=branch + - name: Set up QEMU uses: docker/setup-qemu-action@v3 @@ -45,7 +43,7 @@ jobs: with: file: Dockerfile platforms: linux/amd64,linux/arm64,linux/arm/v7 - push: ${{ steps.docker_meta_debian.outputs.tags != '' }} + push: true tags: ${{ steps.docker_meta_debian.outputs.tags }} labels: ${{ steps.docker_meta_debian.outputs.labels }} @@ -68,9 +66,8 @@ jobs: images: | neilpang/letsproxy tags: | - type=semver,suffix=-alpine,pattern={{version}} - type=semver,suffix=-alpine,pattern={{major}}.{{minor}} - type=raw,value=alpine,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }} + type=raw,value=alpine,enable=${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }} + type=ref,suffix=-alpine,event=branch flavor: latest=false - name: Set up QEMU @@ -91,7 +88,7 @@ jobs: with: file: Dockerfile.alpine platforms: linux/amd64,linux/arm64,linux/arm/v7 - push: ${{ steps.docker_meta_alpine.outputs.tags != '' }} + push: true tags: ${{ steps.docker_meta_alpine.outputs.tags }} labels: ${{ steps.docker_meta_alpine.outputs.labels }}