Merge branch 'main' into ENGDOCS-2329

Author: aevesdocker

.github/CODEOWNERS

@@ -15,12 +15,16 @@
 
 /content/manuals/extensions-sdk/ @aevesdocker
 
-/content/manuals/scout/ @dvdksn
+/content/manuals/scout/ @craig-osterhout
 
 /content/manuals/docker-hub/ @craig-osterhout
 
 /content/manuals/engine/ @dvdksn
 
+/content/reference/api/engine/ @dvdksn
+
+/content/reference/cli/ @dvdksn
+
 /content/manuals/subscription/ @sarahsanders-docker
 
 /content/manuals/security/ @aevesdocker
@@ -29,7 +33,7 @@
 
 /content/manuals/docker-hub/official_images/ @craig-osterhout
 
-/content/manuals/registry/ @dvdksn
+/content/manuals/registry/ @craig-osterhout
 
 /content/manuals/admin/ @sarahsanders-docker
 
@@ -38,3 +42,5 @@
 /content/manuals/accounts/ @sarahsanders-docker
 
 /hack @dvdksn
+
+/_vendor @dvdksn

.github/workflows/build.yml

@@ -11,22 +11,27 @@ on:
       - main
   pull_request:
 
+env:
+  # Use edge release of buildx (latest RC, fallback to latest stable)
+  SETUP_BUILDX_VERSION: edge
+  SETUP_BUILDKIT_IMAGE: "moby/buildkit:latest"
+
 permissions:
   contents: read # to fetch code (actions/checkout)
 
 jobs:
   releaser:
     runs-on: ubuntu-24.04
     steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v4
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
+        with:
+          version: ${{ env.SETUP_BUILDX_VERSION }}
+          driver-opts: image=${{ env.SETUP_BUILDKIT_IMAGE }}
       -
         name: Build
-        uses: docker/bake-action@v5
+        uses: docker/bake-action@v6
         with:
           files: |
             docker-bake.hcl
@@ -48,8 +53,9 @@ jobs:
         uses: docker/setup-buildx-action@v3
       -
         name: Build
-        uses: docker/bake-action@v5
+        uses: docker/bake-action@v6
         with:
+          source: .
           files: |
             docker-bake.hcl
           targets: release
@@ -58,8 +64,9 @@ jobs:
             *.cache-to=type=gha,scope=build,mode=max
       -
         name: Check Cloudfront config
-        uses: docker/bake-action@v5
+        uses: docker/bake-action@v6
         with:
+          source: .
           targets: aws-cloudfront-update
         env:
           DRY_RUN: true
@@ -91,20 +98,18 @@ jobs:
           - dockerfile-lint
           - path-warnings
     steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v4
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       -
         name: Validate
-        uses: docker/bake-action@v5
+        uses: docker/bake-action@v6
         with:
           files: |
             docker-bake.hcl
           targets: ${{ matrix.target }}
           set: |
+            *.args.BUILDKIT_CONTEXT_KEEP_GIT_DIR=1
             *.cache-to=type=gha,scope=validate-${{ matrix.target }},mode=max
             *.cache-from=type=gha,scope=validate-${{ matrix.target }}
             *.cache-from=type=gha,scope=build

.github/workflows/deploy.yml

@@ -12,6 +12,11 @@ on:
       - main
       - published
 
+env:
+  # Use edge release of buildx (latest RC, fallback to latest stable)
+  SETUP_BUILDX_VERSION: edge
+  SETUP_BUILDKIT_IMAGE: "moby/buildkit:latest"
+
 # these permissions are needed to interact with GitHub's OIDC Token endpoint.
 permissions:
   id-token: write
@@ -80,10 +85,14 @@ jobs:
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
+        with:
+          version: ${{ env.SETUP_BUILDX_VERSION }}
+          driver-opts: image=${{ env.SETUP_BUILDKIT_IMAGE }}
       -
         name: Build website
-        uses: docker/bake-action@v5
+        uses: docker/bake-action@v6
         with:
+          source: .
           files: |
             docker-bake.hcl
           targets: release
@@ -119,8 +128,9 @@ jobs:
       -
         name: Update S3 config
         if: ${{ env.DOCS_S3_BUCKET != '' && env.DOCS_S3_CONFIG != '' }}
-        uses: docker/bake-action@v5
+        uses: docker/bake-action@v6
         with:
+          source: .
           files: |
             docker-bake.hcl
           targets: aws-s3-update-config
@@ -133,8 +143,9 @@ jobs:
       -
         name: Update Cloudfront config
         if: ${{ env.DOCS_CLOUDFRONT_ID != '' }}
-        uses: docker/bake-action@v5
+        uses: docker/bake-action@v6
         with:
+          source: .
           files: |
             docker-bake.hcl
           targets: aws-cloudfront-update

.github/workflows/merge.yml

@@ -24,7 +24,7 @@ jobs:
           git fetch origin main:main
           git reset --hard main
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f
+        uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f
         with:
           delete-branch: false
           branch: published-update

.github/workflows/validate-upstream.yml

@@ -23,6 +23,11 @@ on:
         type: boolean
         required: false
 
+env:
+  # Use edge release of buildx (latest RC, fallback to latest stable)
+  SETUP_BUILDX_VERSION: edge
+  SETUP_BUILDKIT_IMAGE: "moby/buildkit:latest"
+
 jobs:
   run:
     runs-on: ubuntu-24.04
@@ -80,10 +85,14 @@ jobs:
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
+        with:
+          version: ${{ env.SETUP_BUILDX_VERSION }}
+          driver-opts: image=${{ env.SETUP_BUILDKIT_IMAGE }}
       -
         name: Validate
-        uses: docker/bake-action@v5
+        uses: docker/bake-action@v6
         with:
+          source: .
           files: |
             docker-bake.hcl
           targets: validate-upstream

Dockerfile

@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1
 # check=skip=InvalidBaseImagePlatform
 
-ARG ALPINE_VERSION=3.20
+ARG ALPINE_VERSION=3.21
 ARG GO_VERSION=1.23
 ARG HTMLTEST_VERSION=0.17.0
-ARG HUGO_VERSION=0.139.0
+ARG HUGO_VERSION=0.141.0
 ARG NODE_VERSION=22
-ARG PAGEFIND_VERSION=1.1.1
+ARG PAGEFIND_VERSION=1.3.0
 
 # base defines the generic base stage
 FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS base

README.md

@@ -49,4 +49,4 @@ contribute, see [CONTRIBUTING.md](CONTRIBUTING.md).
 
 ## Copyright and license
 
-Copyright 2013-2024 Docker, Inc., released under the <a href="https://github.com/docker/docs/blob/main/LICENSE">Apache 2.0 license</a> .
+Copyright 2013-2025 Docker, Inc., released under the <a href="https://github.com/docker/docs/blob/main/LICENSE">Apache 2.0 license</a> .

_vale/Docker/Acronyms.yml

@@ -5,24 +5,30 @@ level: warning
 ignorecase: false
 # Ensures that the existence of 'first' implies the existence of 'second'.
 first: '\b([A-Z]{2,5})\b'
-second: '(?:\b[A-Z][a-z]+ )+\(([A-Z]{2,5})\)'
+second: '(?:\b[A-Z][a-z]+ )+\(([A-Z]{2,5})s?\)'
 # ... with the exception of these:
 exceptions:
   - AGPL
+  - AI
   - API
   - ARM
   - ASP
   - AUFS
   - AWS
   - BIOS
+  - BPF
+  - BSD
+  - CFS
   - CI
+  - CIDR
   - CISA
   - CLI
   - CNCF
   - CORS
   - CPU
   - CSS
   - CSV
+  - CUDA
   - CVE
   - DCT
   - DEBUG
@@ -35,7 +41,9 @@ exceptions:
   - ECI
   - ELK
   - FAQ
+  - FPM
   - FUSE
+  - GB
   - GCC
   - GDB
   - GET
@@ -52,9 +60,13 @@ exceptions:
   - HTTP
   - HTTPS
   - IAM
+  - IBM
+  - IDE
   - ID
   - IDE
   - IP
+  - IPAM
+  - IPC
   - IT
   - JAR
   - JIT
@@ -66,18 +78,23 @@ exceptions:
   - MAC
   - MDM
   - MDN
+  - MSI
   - NAT
   - NET
   - NFS
   - NOTE
+  - NTFS
   - NTLM
+  - NUMA
   - NVDA
   - OCI
   - OS
+  - OSI
   - OSS
   - PATH
   - PDF
   - PEM
+  - PID
   - PHP
   - POSIX
   - POST
@@ -86,6 +103,7 @@ exceptions:
   - RAM
   - REPL
   - REST
+  - RFC
   - RHEL
   - RPM
   - RSA
@@ -120,13 +138,16 @@ exceptions:
   - USB
   - USD
   - UTF
+  - UTS
   - UUID
   - VAT
+  - VIP
   - VLAN
   - VM
   - VPN
   - WSL
   - XML
   - XSS
   - YAML
+  - ZFS
   - ZIP