Changing the structure of the section

_data/toc.yaml

@@ -1392,11 +1392,14 @@ manuals:
       title: Hello Build
     - sectiontitle: Buildx
       section:
-        - path: /build/buildx/
-          title: Working with Buildx
         - path: /build/buildx/install/
           title: Install Buildx
-
+        - path: /build/buildx/
+          title: Working with Buildx
+        - path: /build/buildx/multiple-builders/
+          title: Using multiple builders
+        - path: /build/buildx/multiarch-images/
+          title: Building multi-platform images                  
 - sectiontitle: Docker Compose
   section:
   - path: /compose/

build/buildx/index.md

@@ -1,7 +1,7 @@
 ---
-title: Buildx
+title: Working with Buildx
 description: Working with Docker Buildx
-keywords: build, buildx, buildkit
+keywords: build, buildx, BuildKit
 redirect_from:
 - /buildx/working-with-buildx/
 ---
@@ -47,115 +47,6 @@ automatically added to the "docker images" view by default, whereas when using
 other drivers, the method for outputting an image needs to be selected
 with `--output`.
 
-## Work with builder instances
-
-By default, Buildx uses the `docker` driver if it is supported, providing a user
-experience very similar to the native `docker build`. Note that you must use a
-local shared daemon to build your applications.
-
-Buildx allows you to create new instances of isolated builders. You can use this
-to get a scoped environment for your CI builds that does not change the state of
-the shared daemon, or for isolating builds for different projects. You can create
-a new instance for a set of remote nodes, forming a build farm, and quickly
-switch between them.
-
-You can create new instances using the [`docker buildx create`](../../engine/reference/commandline/buildx_create.md)
-command. This creates a new builder instance with a single node based on your
-current configuration.
-
-To use a remote node you can specify the `DOCKER_HOST` or the remote context name
-while creating the new builder. After creating a new instance, you can manage its
-lifecycle using the [`docker buildx inspect`](../../engine/reference/commandline/buildx_inspect.md),
-[`docker buildx stop`](../../engine/reference/commandline/buildx_stop.md), and
-[`docker buildx rm`](../../engine/reference/commandline/buildx_rm.md) commands.
-To list all available builders, use [`docker buildx ls`](../../engine/reference/commandline/buildx_ls.md).
-After creating a new builder you can also append new nodes to it.
-
-To switch between different builders, use [`docker buildx use <name>`](../../engine/reference/commandline/buildx_use.md).
-After running this command, the build commands will automatically use this
-builder.
-
-Docker also features a [`docker context`](../../engine/reference/commandline/context.md)
-command that you can use to provide names for remote Docker API endpoints. Buildx
-integrates with `docker context` to ensure all the contexts automatically get a
-default builder instance. You can also set the context name as the target when
-you create a new builder instance or when you add a node to it.
-
-## Build multi-platform images
-
-BuildKit is designed to work well for building for multiple platforms and not
-only for the architecture and operating system that the user invoking the build
-happens to run.
-
-When you invoke a build, you can set the `--platform` flag to specify the target
-platform for the build output, (for example, `linux/amd64`, `linux/arm64`, or
-`darwin/amd64`).
-
-When the current builder instance is backed by the `docker-container` driver,
-you can specify multiple platforms together. In this case, it builds a manifest
-list which contains images for all specified architectures. When you use this
-image in [`docker run`](../../engine/reference/commandline/run.md) or
-[`docker service`](../../engine/reference/commandline/service.md), Docker picks
-the correct image based on the node's platform.
-
-You can build multi-platform images using three different strategies that are
-supported by Buildx and Dockerfiles:
-
-1. Using the QEMU emulation support in the kernel
-2. Building on multiple native nodes using the same builder instance
-3. Using a stage in Dockerfile to cross-compile to different architectures
-
-QEMU is the easiest way to get started if your node already supports it (for
-example. if you are using Docker Desktop). It requires no changes to your
-Dockerfile and BuildKit automatically detects the secondary architectures that
-are available. When BuildKit needs to run a binary for a different architecture,
-it automatically loads it through a binary registered in the `binfmt_misc`
-handler.
-
-For QEMU binaries registered with `binfmt_misc` on the host OS to work
-transparently inside containers, they must be statically compiled and registered
-with the `fix_binary` flag. This requires a kernel >= 4.8 and
-binfmt-support >= 2.1.7. You can check for proper registration by checking if
-`F` is among the flags in `/proc/sys/fs/binfmt_misc/qemu-*`. While Docker
-Desktop comes preconfigured with `binfmt_misc` support for additional platforms,
-for other installations it likely needs to be installed using
-[`tonistiigi/binfmt`](https://github.com/tonistiigi/binfmt){:target="_blank" rel="noopener" class="_"}
-image.
-
-```console
-$ docker run --privileged --rm tonistiigi/binfmt --install all
-```
-
-Using multiple native nodes provide better support for more complicated cases
-that are not handled by QEMU and generally have better performance. You can
-add additional nodes to the builder instance using the `--append` flag.
-
-Assuming contexts `node-amd64` and `node-arm64` exist in `docker context ls`;
-
-```console
-$ docker buildx create --use --name mybuild node-amd64
-mybuild
-$ docker buildx create --append --name mybuild node-arm64
-$ docker buildx build --platform linux/amd64,linux/arm64 .
-```
-
-Finally, depending on your project, the language that you use may have good
-support for cross-compilation. In that case, multi-stage builds in Dockerfiles
-can be effectively used to build binaries for the platform specified with
-`--platform` using the native architecture of the build node. A list of build
-arguments like `BUILDPLATFORM` and `TARGETPLATFORM` is available automatically
-inside your Dockerfile and can be leveraged by the processes running as part
-of your build.
-
-```dockerfile
-# syntax=docker/dockerfile:1
-FROM --platform=$BUILDPLATFORM golang:alpine AS build
-ARG TARGETPLATFORM
-ARG BUILDPLATFORM
-RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" > /log
-FROM alpine
-COPY --from=build /log /log
-```
 
 ## High-level build options
 

build/buildx/install.md

@@ -1,7 +1,7 @@
 ---
 title: Install Docker Buildx
 description: How to install Docker Buildx
-keywords: build, buildx, buildkit
+keywords: build, buildx, BuildKit
 ---
 
 ## Docker Desktop
@@ -75,4 +75,4 @@ sets up docker builder command as an alias to `docker buildx`. This results in
 the ability to have [`docker build`](../../engine/reference/commandline/build.md)
 use the current buildx builder.
 
-To remove this alias, run [`docker buildx uninstall`](../../engine/reference/commandline/buildx_uninstall.md).
+To remove this alias, run [`docker buildx uninstall`](../../engine/reference/commandline/buildx_uninstall.md).

build/buildx/multiarch-images.md

@@ -0,0 +1,78 @@
+---
+title: Building multi-platform images
+description: Different strategies for building multiplatform images
+keywords: build, buildx, BuildKit, multiplatform images
+---
+BuildKit is designed to work well for building for multiple platforms and not
+only for the architecture and operating system that the user invoking the build
+happens to run.
+
+When you invoke a build, you can set the `--platform` flag to specify the target
+platform for the build output, (for example, `linux/amd64`, `linux/arm64`, or
+`darwin/amd64`).
+
+When the current builder instance is backed by the `docker-container` driver,
+you can specify multiple platforms together. In this case, it builds a manifest
+list which contains images for all specified architectures. When you use this
+image in [`docker run`](../../engine/reference/commandline/run.md) or
+[`docker service`](../../engine/reference/commandline/service.md), Docker picks
+the correct image based on the node's platform.
+
+You can build multi-platform images using three different strategies that are
+supported by Buildx and Dockerfiles:
+
+1. Using the QEMU emulation support in the kernel
+2. Building on multiple native nodes using the same builder instance
+3. Using a stage in Dockerfile to cross-compile to different architectures
+
+QEMU is the easiest way to get started if your node already supports it (for
+example. if you are using Docker Desktop). It requires no changes to your
+Dockerfile and BuildKit automatically detects the secondary architectures that
+are available. When BuildKit needs to run a binary for a different architecture,
+it automatically loads it through a binary registered in the `binfmt_misc`
+handler.
+
+For QEMU binaries registered with `binfmt_misc` on the host OS to work
+transparently inside containers, they must be statically compiled and registered
+with the `fix_binary` flag. This requires a kernel >= 4.8 and
+binfmt-support >= 2.1.7. You can check for proper registration by checking if
+`F` is among the flags in `/proc/sys/fs/binfmt_misc/qemu-*`. While Docker
+Desktop comes preconfigured with `binfmt_misc` support for additional platforms,
+for other installations it likely needs to be installed using
+[`tonistiigi/binfmt`](https://github.com/tonistiigi/binfmt){:target="_blank" rel="noopener" class="_"}
+image.
+
+```console
+$ docker run --privileged --rm tonistiigi/binfmt --install all
+```
+
+Using multiple native nodes provide better support for more complicated cases
+that are not handled by QEMU and generally have better performance. You can
+add additional nodes to the builder instance using the `--append` flag.
+
+Assuming contexts `node-amd64` and `node-arm64` exist in `docker context ls`;
+
+```console
+$ docker buildx create --use --name mybuild node-amd64
+mybuild
+$ docker buildx create --append --name mybuild node-arm64
+$ docker buildx build --platform linux/amd64,linux/arm64 .
+```
+
+Finally, depending on your project, the language that you use may have good
+support for cross-compilation. In that case, multi-stage builds in Dockerfiles
+can be effectively used to build binaries for the platform specified with
+`--platform` using the native architecture of the build node. A list of build
+arguments like `BUILDPLATFORM` and `TARGETPLATFORM` is available automatically
+inside your Dockerfile and can be leveraged by the processes running as part
+of your build.
+
+```dockerfile
+# syntax=docker/dockerfile:1
+FROM --platform=$BUILDPLATFORM golang:alpine AS build
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" > /log
+FROM alpine
+COPY --from=build /log /log
+```

build/buildx/multiple-builders.md

@@ -0,0 +1,36 @@
+---
+title: Using multiple builders
+description: How to instantiate and work with multiple builders
+keywords: build, buildx, BuildKit, builders, build drivers
+---
+By default, Buildx uses the `docker` driver if it is supported, providing a user
+experience very similar to the native `docker build`. Note that you must use a
+local shared daemon to build your applications.
+
+Buildx allows you to create new instances of isolated builders. You can use this
+to get a scoped environment for your CI builds that does not change the state of
+the shared daemon, or for isolating builds for different projects. You can create
+a new instance for a set of remote nodes, forming a build farm, and quickly
+switch between them.
+
+You can create new instances using the [`docker buildx create`](../../engine/reference/commandline/buildx_create.md)
+command. This creates a new builder instance with a single node based on your
+current configuration.
+
+To use a remote node you can specify the `DOCKER_HOST` or the remote context name
+while creating the new builder. After creating a new instance, you can manage its
+lifecycle using the [`docker buildx inspect`](../../engine/reference/commandline/buildx_inspect.md),
+[`docker buildx stop`](../../engine/reference/commandline/buildx_stop.md), and
+[`docker buildx rm`](../../engine/reference/commandline/buildx_rm.md) commands.
+To list all available builders, use [`docker buildx ls`](../../engine/reference/commandline/buildx_ls.md).
+After creating a new builder you can also append new nodes to it.
+
+To switch between different builders, use [`docker buildx use <name>`](../../engine/reference/commandline/buildx_use.md).
+After running this command, the build commands will automatically use this
+builder.
+
+Docker also features a [`docker context`](../../engine/reference/commandline/context.md)
+command that you can use to provide names for remote Docker API endpoints. Buildx
+integrates with `docker context` to ensure all the contexts automatically get a
+default builder instance. You can also set the context name as the target when
+you create a new builder instance or when you add a node to it.

build/index.md

@@ -27,3 +27,60 @@ BuildKit is the backend evolution from the Legacy Builder, it comes with new
 and much improved functionality that can be powerful tools for improving your
 builds' performance or reusability of your Dockerfiles, and it also introduces
 support for complex scenarios.
+
+## Docker Build features
+
+Docker Build is way more than your `docker build` command and is not only about packaging your code, it’s a whole ecosystem of tools and features that support you not only with common workflow tasks but also provides you with support for more complex and advanced scenarios.
+Here’s an overview of all the use cases with which Build can support you:
+
+### Building your images
+
+* **Packaging your software**  
+Bundle and package your code to run anywhere, from your local Docker Desktop, to Docker Engine and Kubernetes on the cloud.  
+To get started with Build, see the [Hello Build](hellobuild.md) page.
+
+* **Choosing a build driver**  
+Run Buildx with different configurations depending on the scenario you are working on, regardless of whether you are using your local machine or a remote compute cluster, all from the comfort of your local working environment.  
+Here’s a quick overview of the drivers and the use cases they support:  
+    * `docker`– use the default built-in builder to get started quickly.
+    * `docker-container` – spin up a dedicated builder in a docker container to unlock more advanced features like advanced caching, and multi-arch images.
+    * `kubernetes`– connect to your Kubernetes cluster to unlock more features and to run your builds at scale.
+    * `remote`–  manually manage your own BuildKit builder and connect directly to it.
+
+* **Optimizing builds with cache management**  
+Improve build performance by using a persistent shared build cache to avoid repeating costly operations such as package installations, downloading files from the internet, or code build steps.
+
+* **Creating build-once, run-anywhere with multi-architecture builds**
+Collaborate across platforms with one build artifact.  
+See [Build multi platform images](buildx/multiarch-images.md).
+
+### Automating your builds
+
+* **Integrating with GitHub**  
+Automate your image builds to run in GitHub actions using the official docker build actions. See:  
+    * [GitHub Action to build and push Docker images with Buildx](https://github.com/docker/build-push-action).
+    * [GitHub Action to extract metadata from Git reference and GitHub events](https://github.com/docker/metadata-action/).
+
+* **Orchestrating builds across complex projects together**  
+Connect your builds together and easily parameterize your images using buildx bake.  
+<!--replace when Bake content is onboarded -->
+See [High-level build options](buildx/index.md/#high-level-build-options)
+
+### Customizing your Builds
+
+* **Select your build output format**  
+Choose from a variety of available output formats, to export any artifact you like from BuildKit, not just docker images.  
+See [Set the export action for the build result](../engine/reference/commandline/buildx_build.md/#output).
+
+* **Managing build secrets**  
+Securely access protected repositories and resources at build time without leaking data into the final build or the cache.
+
+### Extending BuildKit
+
+* **Custom syntax on Dockerfile**  
+Use experimental versions of the Dockerfile frontend, or even just bring your own to BuildKit using the power of custom frontends.  
+See also the [Syntax directive](../engine/reference/builder/#syntax).
+
+* **Configure BuildKit**  
+Take a deep dive into the internal BuildKit configuration to get the most out of your builds.  
+See also [`buildkitd.toml`](https://github.com/moby/buildkit/blob/master/docs/buildkitd.toml.md), the configuration file for `buildkitd`.