Merge pull request #22129 from docker/published-update

publish updates from main

Author: aevesdocker

content/manuals/build-cloud/_index.md

@@ -69,4 +69,4 @@ Once you've signed up and created a builder, continue by
 [setting up the builder in your local environment](./setup.md).
 
 For information about roles and permissions related to Docker Build Cloud, see
-[Roles and Permissions](/manuals/security/for-admins/roles-and-permissions.md#docker-build-cloud).
+[Roles and Permissions](/manuals/security/for-admins/roles-and-permissions.md#docker-build-cloud-permissions).

content/manuals/build/ci/github-actions/multi-platform.md

@@ -124,8 +124,7 @@ on:
   push:
 
 env:
-  DOCKERHUB_REPO: docker-user/my-app
-  GHCR_REPO: ghcr.io/gh-user/my-app
+  REGISTRY_IMAGE: user/app
 
 jobs:
   build:
@@ -146,23 +145,14 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: |
-            ${{ env.DOCKERHUB_REPO }}
-            ${{ env.GHCR_REPO }}
+          images: ${{ env.REGISTRY_IMAGE }}
 
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
           username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Login to GHCR
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
 
@@ -175,7 +165,8 @@ jobs:
         with:
           platforms: ${{ matrix.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,"name=${{ env.DOCKERHUB_REPO }},${{ env.GHCR_REPO }}",push-by-digest=true,name-canonical=true,push=true
+          tags: ${{ env.REGISTRY_IMAGE }}
+          outputs: type=image,push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
         run: |
@@ -209,23 +200,14 @@ jobs:
           username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Login to GHCR
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: |
-            ${{ env.DOCKERHUB_REPO }}
-            ${{ env.GHCR_REPO }}
+          images: ${{ env.REGISTRY_IMAGE }}
           tags: |
             type=ref,event=branch
             type=ref,event=pr
@@ -236,14 +218,11 @@ jobs:
         working-directory: ${{ runner.temp }}/digests
         run: |
           docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf '${{ env.DOCKERHUB_REPO }}@sha256:%s ' *)
-          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf '${{ env.GHCR_REPO }}@sha256:%s ' *)
+            $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *)
 
       - name: Inspect image
         run: |
-          docker buildx imagetools inspect ${{ env.DOCKERHUB_REPO }}:${{ steps.meta.outputs.version }}
-          docker buildx imagetools inspect ${{ env.GHCR_REPO }}:${{ steps.meta.outputs.version }}
+          docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}
 ```
 
 ### With Bake
@@ -377,9 +356,9 @@ jobs:
             cwd://${{ runner.temp }}/bake-meta.json
           targets: image
           set: |
-            *.tags=
+            *.tags=${{ env.REGISTRY_IMAGE }}
             *.platform=${{ matrix.platform }}
-            *.output=type=image,"name=${{ env.REGISTRY_IMAGE }}",push-by-digest=true,name-canonical=true,push=true
+            *.output=type=image,push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
         run: |

content/manuals/build/ci/github-actions/share-image-jobs.md

@@ -7,6 +7,7 @@ keywords: ci, github actions, gha, buildkit, buildx
 
 As each job is isolated in its own runner, you can't use your built image
 between jobs, except if you're using [self-hosted runners](https://docs.github.com/en/actions/hosting-your-own-runners/about-self-hosted-runners)
+or [Docker Build Cloud](/build-cloud).
 However, you can [pass data between jobs](https://docs.github.com/en/actions/using-workflows/storing-workflow-data-as-artifacts#passing-data-between-jobs-in-a-workflow)
 in a workflow using the [actions/upload-artifact](https://github.com/actions/upload-artifact)
 and [actions/download-artifact](https://github.com/actions/download-artifact)

content/manuals/security/for-admins/roles-and-permissions.md

@@ -110,12 +110,8 @@ The following table outlines Docker Build Cloud management permissions for membe
 
 | Permission                   | Member | Editor | Organization owner |
 | ---------------------------- | :----- | :----- | :----------------- |
-| Sign up for starter plan     | ✅     | ✅     | ✅                 |
-| Use a cloud builder          | ✅ \*  | ✅ \*  | ✅ \*              |
-| Manage seat allocation       | ✅     | ✅     | ✅                 |
+| Use a cloud builder          | ✅     | ✅     | ✅                 |
 | Create and remove builders   | ✅     | ✅     | ✅                 |
-| Buy seats or reduce seat cap | ❌     | ❌     | ✅                 |
+| Configure builder settings   | ✅     | ✅     | ✅                 |
 | Buy minutes                  | ❌     | ❌     | ✅                 |
 | Manage subscription          | ❌     | ❌     | ✅                 |
-
-_\* Requires a Docker Build Cloud seat allocation_