Merge pull request #8584 from Homebrew/docker-tweaks

workflows: tweak docker.

.github/workflows/docker.yml

@@ -30,33 +30,33 @@ jobs:
       - name: Run brew test-bot --only-setup
         run: docker run --rm brew brew test-bot --only-setup
 
-      - name: Deploy the tagged Docker image to GitHub
+      - name: Deploy the tagged Docker image to GitHub Packages
         if: startsWith(github.ref, 'refs/tags/')
         run: |
           brew_version=${GITHUB_REF:10}
           echo "::set-env name=brew_version::$brew_version"
-          docker login ghcr.io -u BrewTestBot -p ${{secrets.HOMEBREW_GITHUB_PACKAGES_API_TOKEN}}
-          docker tag brew "ghcr.io/homebrew/ubuntu${{matrix.version}}:$brew_version"
-          docker push "ghcr.io/homebrew/ubuntu${{matrix.version}}:$brew_version"
-          docker tag brew "ghcr.io/homebrew/ubuntu${{matrix.version}}:latest"
-          docker push "ghcr.io/homebrew/ubuntu${{matrix.version}}:latest"
+          echo ${{secrets.HOMEBREW_GITHUB_PACKAGES_API_TOKEN}} | docker login ghcr.io -u BrewTestBot --password-stdin
+          docker tag brew "ghcr.io/Homebrew/ubuntu${{matrix.version}}:$brew_version"
+          docker push "ghcr.io/Homebrew/ubuntu${{matrix.version}}:$brew_version"
+          docker tag brew "ghcr.io/Homebrew/ubuntu${{matrix.version}}:latest"
+          docker push "ghcr.io/Homebrew/ubuntu${{matrix.version}}:latest"
 
       - name: Deploy the tagged Docker image to Docker Hub
         if: startsWith(github.ref, 'refs/tags/')
         run: |
-          docker login -u brewtestbot -p ${{secrets.DOCKER_TOKEN}}
+          echo ${{secrets.DOCKER_TOKEN}} | docker login -u brewtestbot --password-stdin
           docker tag brew "homebrew/ubuntu${{matrix.version}}:$brew_version"
           docker push "homebrew/ubuntu${{matrix.version}}:$brew_version"
           docker tag brew "homebrew/ubuntu${{matrix.version}}:latest"
           docker push "homebrew/ubuntu${{matrix.version}}:latest"
 
-      - name: Deploy the homebrew/brew Docker image to GitHub and Docker Hub
+      - name: Deploy the homebrew/brew Docker image to GitHub Packages and Docker Hub
         if: startsWith(github.ref, 'refs/tags/') && matrix.version == '20.04'
         run: |
-          docker tag brew "ghcr.io/homebrew/brew:$brew_version"
-          docker push "ghcr.io/homebrew/brew:$brew_version"
-          docker tag brew "ghcr.io/homebrew/brew:latest"
-          docker push "ghcr.io/homebrew/brew:latest"
+          docker tag brew "ghcr.io/Homebrew/brew:$brew_version"
+          docker push "ghcr.io/Homebrew/brew:$brew_version"
+          docker tag brew "ghcr.io/Homebrew/brew:latest"
+          docker push "ghcr.io/Homebrew/brew:latest"
           docker tag brew "homebrew/brew:$brew_version"
           docker push "homebrew/brew:$brew_version"
           docker tag brew "homebrew/brew:latest"

.github/workflows/tests.yml

@@ -139,12 +139,12 @@ jobs:
           brew test-bot --only-formulae --test-default-formula
         fi
 
-    - name: Deploy the Docker image to GitHub and Docker Hub
+    - name: Deploy the Docker image to GitHub Packages and Docker Hub
       if: matrix.os == 'ubuntu-latest' && github.ref == 'refs/heads/master'
       run: |
-        docker login ghcr.io -u BrewTestBot -p ${{secrets.HOMEBREW_GITHUB_PACKAGES_API_TOKEN}}
-        docker tag brew "ghcr.io/homebrew/ubuntu16.04:master"
-        docker push "ghcr.io/homebrew/ubuntu16.04:master"
-        docker login -u brewtestbot -p ${{secrets.DOCKER_TOKEN}}
+        echo ${{secrets.HOMEBREW_GITHUB_PACKAGES_API_TOKEN}} | docker login ghcr.io -u BrewTestBot --password-stdin
+        docker tag brew "ghcr.io/Homebrew/ubuntu16.04:master"
+        docker push "ghcr.io/Homebrew/ubuntu16.04:master"
+        echo ${{secrets.DOCKER_TOKEN}} | docker login -u brewtestbot --password-stdin
         docker tag brew "homebrew/ubuntu16.04:master"
         docker push "homebrew/ubuntu16.04:master"