From 096e2ccb857c772e8accb56d28a4ca87dd9c8cd9 Mon Sep 17 00:00:00 2001 From: adlofp <73983769+adlofp@users.noreply.github.com> Date: Wed, 10 Dec 2025 22:22:55 +0800 Subject: [PATCH 1/6] Update go.sh --- go.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/go.sh b/go.sh index 6a6d6cd..3e10290 100644 --- a/go.sh +++ b/go.sh @@ -1,5 +1,8 @@ #!/bin/sh +# 监听端口设置，可通过环境变量 CFNAT_LISTEN_PORT 覆盖 +LISTEN_PORT="${CFNAT_LISTEN_PORT:-1234}" + # 检测系统架构 ARCH=$(uname -m) CFNAT_BINARY='./cfnat' @@ -33,7 +36,7 @@ do -port="$port" \ -delay="$delay" \ -ips="$ips" \ - -addr="0.0.0.0:1234" \ + -addr="0.0.0.0:$LISTEN_PORT" \ -ipnum="$ipnum" \ -num="$num" \ -random="$random" \ @@ -49,4 +52,4 @@ do # 等待 5 秒后重启 sleep 5 -done \ No newline at end of file +done From d95286053bed80cdfb380037df52e3110245dcef Mon Sep 17 00:00:00 2001 From: adlofp <73983769+adlofp@users.noreply.github.com> Date: Wed, 10 Dec 2025 22:34:14 +0800 Subject: [PATCH 2/6] Add Docker Image CI workflow --- .github/workflows/docker-image.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/docker-image.yml diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml new file mode 100644 index 0000000..3f53646 --- /dev/null +++ b/.github/workflows/docker-image.yml @@ -0,0 +1,18 @@ +name: Docker Image CI + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +jobs: + + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - name: Build the Docker image + run: docker build . --file Dockerfile --tag my-image-name:$(date +%s) From d806a8797b743d6a2cc1def3482f8b06cb15e934 Mon Sep 17 00:00:00 2001 From: adlofp <73983769+adlofp@users.noreply.github.com> Date: Thu, 11 Dec 2025 10:37:12 +0800 Subject: [PATCH 3/6] Create docker-image1.yml --- .github/workflows/docker-image1.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/docker-image1.yml diff --git a/.github/workflows/docker-image1.yml b/.github/workflows/docker-image1.yml new file mode 100644 index 0000000..fcbb3e2 --- /dev/null +++ b/.github/workflows/docker-image1.yml @@ -0,0 +1,28 @@ +name: Build and Push Docker Image +on: + push: + branches: [ main ] # 推送到main分支时触发 + # 注意：fork的仓库，默认不会响应原仓库的tag推送 + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Log in to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Build and push Docker image + uses: docker/build-push-action@v5 + with: + context: . + push: true + # 将镜像标签中的用户名改为你自己的 + tags: | + your-dockerhub-username/your-image-name:${{ github.sha }} + your-dockerhub-username/your-image-name:latest From f72b20fa9502d2c4b3db75e392820125bf0843fd Mon Sep 17 00:00:00 2001 From: adlofp <73983769+adlofp@users.noreply.github.com> Date: Thu, 11 Dec 2025 10:39:37 +0800 Subject: [PATCH 4/6] Change Docker image tag from cmliu to adlofp --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 64f7917..2a7c89b 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -33,4 +33,4 @@ jobs: context: . push: true platforms: linux/amd64,linux/arm64,linux/386,linux/arm/v6,linux/arm/v7 - tags: cmliu/cfnat:latest + tags: adlofp/cfnat:latest From bf5d735f9d2f72b11631e38d337fbeb10dea2443 Mon Sep 17 00:00:00 2001 From: adlofp <73983769+adlofp@users.noreply.github.com> Date: Thu, 11 Dec 2025 10:45:59 +0800 Subject: [PATCH 5/6] Delete .github/workflows/docker-image.yml --- .github/workflows/docker-image.yml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 .github/workflows/docker-image.yml diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml deleted file mode 100644 index 3f53646..0000000 --- a/.github/workflows/docker-image.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: Docker Image CI - -on: - push: - branches: [ "main" ] - pull_request: - branches: [ "main" ] - -jobs: - - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - - name: Build the Docker image - run: docker build . --file Dockerfile --tag my-image-name:$(date +%s) From 59a7c733c768f7da2a8774a053a005d00b84ce50 Mon Sep 17 00:00:00 2001 From: adlofp <73983769+adlofp@users.noreply.github.com> Date: Thu, 11 Dec 2025 10:46:12 +0800 Subject: [PATCH 6/6] Delete .github/workflows/docker-image1.yml --- .github/workflows/docker-image1.yml | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 .github/workflows/docker-image1.yml diff --git a/.github/workflows/docker-image1.yml b/.github/workflows/docker-image1.yml deleted file mode 100644 index fcbb3e2..0000000 --- a/.github/workflows/docker-image1.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: Build and Push Docker Image -on: - push: - branches: [ main ] # 推送到main分支时触发 - # 注意：fork的仓库，默认不会响应原仓库的tag推送 - -jobs: - build: - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Log in to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build and push Docker image - uses: docker/build-push-action@v5 - with: - context: . - push: true - # 将镜像标签中的用户名改为你自己的 - tags: | - your-dockerhub-username/your-image-name:${{ github.sha }} - your-dockerhub-username/your-image-name:latest