Merge branch 'v1'

config-env/README.md

@@ -19,7 +19,7 @@
 | `kube-config` | Base64 编码的 kubeconfig | ❌ | `''` |
 | `enable-validation` | 是否执行环境校验 (`true`/`false`) | ❌ | `true` |
 | `docker-registry` | Docker 私有仓库地址 | ❌ | `docker-registry.bjxgj.com` |
-| `docker-username` | Docker 仓库用户名 | ❌ | `ci-action` |
+| `docker-username` | Docker 仓库用户名 | ❌ | `GiteaDocker` |
 | `docker-password` | Docker 仓库密码（当未跳过登录时必填） | ❌ | `''` |
 | `skip-docker-login` | 是否跳过 Docker 登录 (`true`/`false`) | ❌ | `false` |
 

config-env/action.yml

@@ -14,7 +14,7 @@ inputs:
   git-user-email:
     description: 'Git 用户邮箱'
     required: false
-    default: 'actions@gitea.com'
+    default: 'xgj-actions@xmail.bjxgj.com'
   kube-config:
     description: 'Base64 编码的 kubectl 配置文件'
     required: false
@@ -30,7 +30,7 @@ inputs:
   docker-username:
     description: 'Docker 仓库用户名'
     required: false
-    default: 'ci-action'
+    default: 'GiteaDocker'
   docker-password:
     description: 'Docker 仓库密码（开启登录时必填）'
     required: false

setup-env/README.md

@@ -18,7 +18,7 @@
 | 参数名              | 描述                           | 必填 | 默认值                      |
 | ------------------- | ------------------------------ | ---- | --------------------------- |
 | `docker-registry`   | Docker 私有仓库地址            | ❌   | `docker-registry.bjxgj.com` |
-| `docker-username`   | Docker 仓库用户名              | ❌   | `ci-action`                 |
+| `docker-username`   | Docker 仓库用户名              | ❌   | `GiteaDocker`                 |
 | `docker-password`   | Docker 仓库密码                | ✅   | -                           |
 | `kube-config`       | Base64 编码的 kubectl 配置文件 | ❌   | `''`                        |
 | `cache-key`         | 缓存键值                       | ❌   | `setup-env`                 |

setup-env/action.yml

@@ -15,7 +15,7 @@ inputs:
   docker-username:
     description: 'Docker 仓库用户名'
     required: false
-    default: 'ci-action'
+    default: 'GiteaDocker'
   
   docker-password:
     description: 'Docker 仓库密码'

setup-env/examples/full-deployment.yml

@@ -32,7 +32,7 @@ jobs:
         uses: actions/xgj/setup-env@v1
         with:
           docker-registry: ${{ env.REGISTRY }}
-          docker-username: ci-action
+          docker-username: GiteaDocker
           docker-password: ${{ secrets.DOCKER_PASSWORD }}
           cache-key: 'build-${{ github.sha }}'
           use-aliyun-mirror: 'true'