diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml index 570e75e..1f7dc52 100644 --- a/.github/workflows/publish-docker.yml +++ b/.github/workflows/publish-docker.yml @@ -13,10 +13,10 @@ jobs: strategy: matrix: include: - - dockerfile: "./Dockerfile" + - dockerfile: "Dockerfile" platforms: "linux/amd64,linux/arm64/v8" tag_name: "cpu" - - dockerfile: "./nvidia.Dockerfile" + - dockerfile: "nvidia.Dockerfile" platforms: "linux/amd64" tag_name: "cuda" steps: @@ -26,11 +26,16 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 + - name: Lowercase Actor and Extract Repo Name + run: | + echo "ACTOR_LOWER=$(echo ${{ github.actor }} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV + echo "REPO_NAME=$(echo ${{ github.repository }} | cut -d'/' -f 2)" >> $GITHUB_ENV + - name: Login to GitHub Container Registry uses: docker/login-action@v3 with: registry: ghcr.io - username: ${{ github.actor }} + username: ${{ env.ACTOR_LOWER }} password: ${{ secrets.GITHUB_TOKEN }} - name: Login to DockerHub @@ -44,12 +49,12 @@ jobs: uses: docker/build-push-action@v5 with: context: . - file: ${{ matrix.dockerfile }} + file: ./${{ matrix.dockerfile }} platforms: ${{ matrix.platforms }} push: true tags: | - ghcr.io/${{ github.actor }}/alltalk_tts:${{ matrix.tag_name }}-${{ github.sha }} - ghcr.io/${{ github.actor }}/alltalk_tts:${{ matrix.tag_name }} + ghcr.io/${{ env.ACTOR_LOWER }}/${{ env.REPO_NAME }}:${{ matrix.tag_name }}-${{ github.sha }} + ghcr.io/${{ env.ACTOR_LOWER }}/${{ env.REPO_NAME }}:${{ matrix.tag_name }} - name: Docker Hub Description if: vars.DOCKERHUB_USERNAME != '' @@ -57,4 +62,4 @@ jobs: with: username: ${{ vars.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - repository: ${{ vars.DOCKERHUB_USERNAME }}/alltalk_tts + repository: ${{ vars.DOCKERHUB_USERNAME }}/${{ env.REPO_NAME }}