Merge pull request #21539 from crazy-max/gha-docker-login

gha: move docker login step up
docker · Dec 1, 2024 · c650b54 · c650b54
2 parents a65dac8 + e6d3d21
commit c650b54
Show file tree

Hide file tree

Showing 32 changed files with 223 additions and 198 deletions.
diff --git a/content/guides/bun/configure-ci-cd.md b/content/guides/bun/configure-ci-cd.md
@@ -79,17 +79,16 @@ to Docker Hub.
      build:
        runs-on: ubuntu-latest
        steps:
-         -
-           name: Login to Docker Hub
+         - name: Login to Docker Hub
            uses: docker/login-action@v3
            with:
              username: ${{ vars.DOCKER_USERNAME }}
              password: ${{ secrets.DOCKERHUB_TOKEN }}
-         -
-           name: Set up Docker Buildx
+
+         - name: Set up Docker Buildx
            uses: docker/setup-buildx-action@v3
-         -
-           name: Build and push
+
+         - name: Build and push
            uses: docker/build-push-action@v6
            with:
              platforms: linux/amd64,linux/arm64

diff --git a/content/guides/cpp/configure-ci-cd.md b/content/guides/cpp/configure-ci-cd.md
@@ -85,8 +85,10 @@ to Docker Hub.
            with:
              username: ${{ vars.DOCKER_USERNAME }}
              password: ${{ secrets.DOCKERHUB_TOKEN }}
+
          - name: Set up Docker Buildx
            uses: docker/setup-buildx-action@v3
+
          - name: Build and push
            uses: docker/build-push-action@v6
            with:

diff --git a/content/guides/dotnet/configure-ci-cd.md b/content/guides/dotnet/configure-ci-cd.md
@@ -93,13 +93,16 @@ to Docker Hub.
            with:
              username: ${{ vars.DOCKER_USERNAME }}
              password: ${{ secrets.DOCKERHUB_TOKEN }}
+
          - name: Set up Docker Buildx
            uses: docker/setup-buildx-action@v3
+
          - name: Build and test
            uses: docker/build-push-action@v6
            with:
              target: build
              load: true
+
          - name: Build and push
            uses: docker/build-push-action@v6
            with:

diff --git a/content/guides/golang/configure-ci-cd.md b/content/guides/golang/configure-ci-cd.md
@@ -85,8 +85,10 @@ to Docker Hub.
            with:
              username: ${{ vars.DOCKER_USERNAME }}
              password: ${{ secrets.DOCKERHUB_TOKEN }}
+
          - name: Set up Docker Buildx
            uses: docker/setup-buildx-action@v3
+
          - name: Build and push
            uses: docker/build-push-action@v6
            with:

diff --git a/content/guides/java/configure-ci-cd.md b/content/guides/java/configure-ci-cd.md
@@ -88,13 +88,16 @@ to Docker Hub.
            with:
              username: ${{ vars.DOCKER_USERNAME }}
              password: ${{ secrets.DOCKERHUB_TOKEN }}
+
          - name: Set up Docker Buildx
            uses: docker/setup-buildx-action@v3
+
          - name: Build and test
            uses: docker/build-push-action@v6
            with:
              target: test
              load: true
+
          - name: Build and push
            uses: docker/build-push-action@v6
            with:

diff --git a/content/guides/nodejs/configure-ci-cd.md b/content/guides/nodejs/configure-ci-cd.md
@@ -85,17 +85,20 @@ to Docker Hub.
            with:
              username: ${{ vars.DOCKER_USERNAME }}
              password: ${{ secrets.DOCKERHUB_TOKEN }}
+
          - name: Set up Docker Buildx
            uses: docker/setup-buildx-action@v3
+
          - name: Build and test
            uses: docker/build-push-action@v6
            with:
              target: test
              load: true
+
          - name: Build and push
            uses: docker/build-push-action@v6
            with:
-             platforms: linux/amd64,linux/arm64/v8
+             platforms: linux/amd64,linux/arm64
              push: true
              target: prod
              tags: ${{ vars.DOCKER_USERNAME }}/${{ github.event.repository.name }}:latest

diff --git a/content/guides/php/configure-ci-cd.md b/content/guides/php/configure-ci-cd.md
@@ -93,13 +93,16 @@ to Docker Hub.
            with:
              username: ${{ vars.DOCKER_USERNAME }}
              password: ${{ secrets.DOCKERHUB_TOKEN }}
+
          - name: Set up Docker Buildx
            uses: docker/setup-buildx-action@v3
+
          - name: Build and test
            uses: docker/build-push-action@v6
            with:
              target: test
              load: true
+
          - name: Build and push
            uses: docker/build-push-action@v6
            with:

diff --git a/content/guides/python/configure-ci-cd.md b/content/guides/python/configure-ci-cd.md
@@ -85,8 +85,10 @@ to Docker Hub.
            with:
              username: ${{ vars.DOCKER_USERNAME }}
              password: ${{ secrets.DOCKERHUB_TOKEN }}
+
          - name: Set up Docker Buildx
            uses: docker/setup-buildx-action@v3
+
          - name: Build and push
            uses: docker/build-push-action@v6
            with:

diff --git a/content/guides/r/configure-ci-cd.md b/content/guides/r/configure-ci-cd.md
@@ -85,8 +85,10 @@ to Docker Hub.
            with:
              username: ${{ vars.DOCKER_USERNAME }}
              password: ${{ secrets.DOCKERHUB_TOKEN }}
+
          - name: Set up Docker Buildx
            uses: docker/setup-buildx-action@v3
+
          - name: Build and push
            uses: docker/build-push-action@v6
            with:

diff --git a/content/guides/ruby/configure-ci-cd.md b/content/guides/ruby/configure-ci-cd.md
@@ -85,12 +85,13 @@ to Docker Hub.
            with:
              username: ${{ vars.DOCKER_USERNAME }}
              password: ${{ secrets.DOCKERHUB_TOKEN }}
+
          - name: Set up Docker Buildx
            uses: docker/setup-buildx-action@v3
+
          - name: Build and push
            uses: docker/build-push-action@v6
            with:
-             platforms: linux/amd64
              push: true
              tags: ${{ vars.DOCKER_USERNAME }}/${{ github.event.repository.name }}:latest
    ```

diff --git a/content/guides/rust/configure-ci-cd.md b/content/guides/rust/configure-ci-cd.md
@@ -85,8 +85,10 @@ to Docker Hub.
            with:
              username: ${{ vars.DOCKER_USERNAME }}
              password: ${{ secrets.DOCKERHUB_TOKEN }}
+
          - name: Set up Docker Buildx
            uses: docker/setup-buildx-action@v3
+
          - name: Build and push
            uses: docker/build-push-action@v6
            with:

diff --git a/content/manuals/build-cloud/ci.md b/content/manuals/build-cloud/ci.md
@@ -65,18 +65,20 @@ jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
-      - name: Log in to Docker Hub
+      - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
           username: ${{ vars.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PAT }}
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
         with:
           version: "lab:latest"
           driver: cloud
           endpoint: "<ORG>/default"
           install: true
+
       - name: Build and push
         uses: docker/build-push-action@v6
         with:

diff --git a/content/manuals/build/bake/remote-definition.md b/content/manuals/build/bake/remote-definition.md
@@ -173,8 +173,7 @@ remote definition and the local "metadata-only" Bake file, specify both files
 and use the `cwd://` prefix for the metadata Bake file:
 
 ```yml
-      -
-        name: Build
+      - name: Build
         uses: docker/bake-action@v4
         with:
           source: "${{ github.server_url }}/${{ github.repository }}.git#${{ github.ref }}"

diff --git a/content/manuals/build/cache/optimize.md b/content/manuals/build/cache/optimize.md
@@ -323,15 +323,15 @@ jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
           username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Build and push
         uses: docker/build-push-action@v6
         with:

diff --git a/content/manuals/build/ci/github-actions/_index.md b/content/manuals/build/ci/github-actions/_index.md
@@ -122,17 +122,16 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      -
-        name: Login to Docker Hub
+      - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
           username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Set up Docker Buildx
+
+      - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      -
-        name: Build and push
+
+      - name: Build and push
         uses: docker/build-push-action@v6
         with:
           push: true
@@ -170,17 +169,16 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      -
-        name: Login to Docker Hub
+      - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
           username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Set up Docker Buildx
+
+      - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      -
-        name: Build and push
+
+      - name: Build and push
         uses: docker/build-push-action@v6
         with:
           push: true

diff --git a/content/manuals/build/ci/github-actions/annotations.md b/content/manuals/build/ci/github-actions/annotations.md
@@ -33,15 +33,15 @@ jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
           username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Extract metadata
         id: meta
         uses: docker/metadata-action@v5
@@ -75,14 +75,14 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
           username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
       - name: Extract metadata
         id: meta
@@ -128,14 +128,14 @@ jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
           username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+      
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
       - name: Extract metadata
         id: meta

diff --git a/content/manuals/build/ci/github-actions/attestations.md b/content/manuals/build/ci/github-actions/attestations.md
@@ -62,14 +62,14 @@ jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
           username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
       - name: Extract metadata
         id: meta
@@ -108,15 +108,15 @@ jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
           username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Extract metadata
         id: meta
         uses: docker/metadata-action@v5

diff --git a/content/manuals/build/ci/github-actions/build-summary.md b/content/manuals/build/ci/github-actions/build-summary.md
@@ -69,9 +69,8 @@ select the item in the list.
 To disable job summaries, set the `DOCKER_BUILD_SUMMARY` environment variable
 in the YAML configuration for your build step:
 
-```yaml {hl_lines=5}
-      -
-        name: Build
+```yaml {hl_lines=4}
+      - name: Build
         uses: docker/docker-build-push-action@v6
         env:
           DOCKER_BUILD_SUMMARY: false
@@ -86,9 +85,8 @@ To disable the upload of the build record archive to GitHub, set the
 `DOCKER_BUILD_RECORD_UPLOAD` environment variable in the YAML configuration for
 your build step:
 
-```yaml {hl_lines=5}
-      -
-        name: Build
+```yaml {hl_lines=4}
+      - name: Build
         uses: docker/docker-build-push-action@v6
         env:
           DOCKER_BUILD_RECORD_UPLOAD: false