diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml index a00a0a77..2f145b86 100644 --- a/.github/workflows/docker-publish.yaml +++ b/.github/workflows/docker-publish.yaml @@ -21,6 +21,7 @@ jobs: build-amd64: needs: generate-meta runs-on: ubuntu-22.04 + environment: Docker strategy: matrix: include: @@ -86,7 +87,7 @@ jobs: - name: Log in to Docker Hub uses: docker/login-action@v3 with: - username: ${{ secrets.DOCKER_HUB_USERNAME }} + username: ${{ vars.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_PASSWORD }} - name: Build and Push Docker Image (amd64) @@ -108,6 +109,7 @@ jobs: build-arm64: needs: generate-meta runs-on: ubuntu-22.04-arm + environment: Docker strategy: matrix: include: @@ -173,7 +175,7 @@ jobs: - name: Log in to Docker Hub uses: docker/login-action@v3 with: - username: ${{ secrets.DOCKER_HUB_USERNAME }} + username: ${{ vars.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_PASSWORD }} - name: Build and Push Docker Image (arm64) @@ -206,6 +208,7 @@ jobs: - tag_prefix: cu126 - tag_prefix: cu128-lite - tag_prefix: cu128 + environment: Docker steps: - name: Set up Docker Buildx @@ -214,7 +217,7 @@ jobs: - name: Log in to Docker Hub uses: docker/login-action@v3 with: - username: ${{ secrets.DOCKER_HUB_USERNAME }} + username: ${{ vars.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_PASSWORD }} - name: Merge amd64 and arm64 into multi-arch image @@ -223,17 +226,17 @@ jobs: TAG_PREFIX=${{ matrix.tag_prefix }} docker buildx imagetools create \ - --tag ${{ secrets.DOCKER_HUB_USERNAME }}/gpt-sovits:${TAG_PREFIX}-${DATE_TAG} \ - ${{ secrets.DOCKER_HUB_USERNAME }}/gpt-sovits:${TAG_PREFIX}-${DATE_TAG}-amd64 \ - ${{ secrets.DOCKER_HUB_USERNAME }}/gpt-sovits:${TAG_PREFIX}-${DATE_TAG}-arm64 + --tag ${{ vars.DOCKER_HUB_USERNAME }}/gpt-sovits:${TAG_PREFIX}-${DATE_TAG} \ + ${{ vars.DOCKER_HUB_USERNAME }}/gpt-sovits:${TAG_PREFIX}-${DATE_TAG}-amd64 \ + ${{ vars.DOCKER_HUB_USERNAME }}/gpt-sovits:${TAG_PREFIX}-${DATE_TAG}-arm64 docker buildx imagetools create \ - --tag ${{ secrets.DOCKER_HUB_USERNAME }}/gpt-sovits:latest-${TAG_PREFIX} \ - ${{ secrets.DOCKER_HUB_USERNAME }}/gpt-sovits:latest-${TAG_PREFIX}-amd64 \ - ${{ secrets.DOCKER_HUB_USERNAME }}/gpt-sovits:latest-${TAG_PREFIX}-arm64 + --tag ${{ vars.DOCKER_HUB_USERNAME }}/gpt-sovits:latest-${TAG_PREFIX} \ + ${{ vars.DOCKER_HUB_USERNAME }}/gpt-sovits:latest-${TAG_PREFIX}-amd64 \ + ${{ vars.DOCKER_HUB_USERNAME }}/gpt-sovits:latest-${TAG_PREFIX}-arm64 - name: Delete old platform-specific tags via Docker Hub API env: - DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }} + DOCKER_HUB_USERNAME: ${{ vars.DOCKER_HUB_USERNAME }} DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_PASSWORD }} TAG_PREFIX: ${{ matrix.tag_prefix }} DATE_TAG: ${{ needs.generate-meta.outputs.tag }} @@ -258,6 +261,7 @@ jobs: runs-on: ubuntu-latest needs: - merge-and-clean + environment: Docker steps: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -265,12 +269,12 @@ jobs: - name: Log in to Docker Hub uses: docker/login-action@v3 with: - username: ${{ secrets.DOCKER_HUB_USERNAME }} + username: ${{ vars.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_PASSWORD }} - name: Create Default Tag run: | docker buildx imagetools create \ - --tag ${{ secrets.DOCKER_HUB_USERNAME }}/gpt-sovits:latest \ - ${{ secrets.DOCKER_HUB_USERNAME }}/gpt-sovits:latest-cu126-lite + --tag ${{ vars.DOCKER_HUB_USERNAME }}/gpt-sovits:latest \ + ${{ vars.DOCKER_HUB_USERNAME }}/gpt-sovits:latest-cu126-lite \ No newline at end of file