diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4818d1f..654f5c7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -name: Continuous Integration +name: 持续集成 on: push: @@ -19,6 +19,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: yanhao98/composite-actions/docker-build-push@main + with: + login_username: ${{ secrets.DOCKERHUB_USERNAME }} + login_password: ${{ secrets.DOCKERHUB_TOKEN }} # - name: Check Docker image # run: | # set -x diff --git a/docker-build-push/action.yml b/docker-build-push/action.yml index f9d97fa..10e2380 100644 --- a/docker-build-push/action.yml +++ b/docker-build-push/action.yml @@ -1,11 +1,15 @@ name: "打包推送 Docker 镜像" description: "打包 Docker 镜像并推送到 Docker Hub" inputs: - dockerhub_username: - description: "Docker Hub 用户名" + login_repository: + description: "docker/login-action 的 registry 参数" + default: "docker.io" required: true - dockerhub_token: - description: "Docker Hub Token" + login_username: + description: "docker/login-action 的 username 参数" + required: true + login_password: + description: "docker/login-action 的 password 参数" required: true runs: using: "composite" @@ -17,9 +21,9 @@ runs: - name: Login to DockerHub uses: docker/login-action@v3 with: - registry: docker.io - username: ${{ inputs.dockerhub_username }} - password: ${{ inputs.dockerhub_token }} + registry: ${{ inputs.login_repository }} + username: ${{ inputs.login_username }} + password: ${{ inputs.login_password }} - name: Set up QEMU uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx