Merge branch 'main' into summary-bar

Author: sarahsanders-docker

.github/workflows/build.yml

@@ -23,9 +23,6 @@ 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
@@ -34,7 +31,7 @@ jobs:
           driver-opts: image=${{ env.SETUP_BUILDKIT_IMAGE }}
       -
         name: Build
-        uses: docker/bake-action@v5
+        uses: docker/bake-action@v6
         with:
           files: |
             docker-bake.hcl
@@ -56,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
@@ -66,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
@@ -99,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

@@ -90,8 +90,9 @@ jobs:
           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
@@ -127,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
@@ -141,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

@@ -90,8 +90,9 @@ jobs:
           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

@@ -6,7 +6,7 @@ ARG GO_VERSION=1.23
 ARG HTMLTEST_VERSION=0.17.0
 ARG HUGO_VERSION=0.139.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,7 +5,7 @@ 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
@@ -18,14 +18,17 @@ exceptions:
   - BIOS
   - BPF
   - BSD
+  - CFS
   - CI
+  - CIDR
   - CISA
   - CLI
   - CNCF
   - CORS
   - CPU
   - CSS
   - CSV
+  - CUDA
   - CVE
   - DCT
   - DEBUG
@@ -38,6 +41,7 @@ exceptions:
   - ECI
   - ELK
   - FAQ
+  - FPM
   - FUSE
   - GB
   - GCC
@@ -60,6 +64,8 @@ exceptions:
   - ID
   - IDE
   - IP
+  - IPAM
+  - IPC
   - JAR
   - JSON
   - JSX
@@ -73,11 +79,13 @@ exceptions:
   - NET
   - NFS
   - NOTE
+  - NTFS
   - NTLM
   - NUMA
   - NVDA
   - OCI
   - OS
+  - OSI
   - OSS
   - PATH
   - PDF
@@ -90,6 +98,7 @@ exceptions:
   - RAM
   - REPL
   - REST
+  - RFC
   - RHEL
   - RPM
   - RSA
@@ -124,8 +133,10 @@ exceptions:
   - USB
   - USD
   - UTF
+  - UTS
   - UUID
   - VAT
+  - VIP
   - VLAN
   - VM
   - VPN

_vale/config/vocabularies/Docker/accept.txt

@@ -1,9 +1,8 @@
-(?-i)[A-Z]{2,}'?s
+(?i)[A-Z]{2,}'?s
 Amazon
 Anchore
 Apple
 Artifactory
-Autotest
 Azure
 Btrfs
 BuildKit
@@ -59,6 +58,8 @@ JetBrains
 Kerberos
 Kitematic
 Kubernetes
+Laravel
+Laradock
 Linux
 LinuxKit
 Logstash
@@ -95,24 +96,33 @@ VMware
 Wasm
 Windows
 WireMock
+Xdebug
 Zscaler
 Zsh
+[Aa]nonymized?
 [Aa]utobuild
 [Aa]llowlist
+[Aa]utobuilds?
+[Aa]utotests?
+[Bb]uildx
 [Bb]uildpack(s)?
 [Bb]uildx
 [Cc]odenames?
 [Cc]ompose
+[Cc]onfigs
 [Dd]istroless
 [Ff]ilepaths?
 [Ff]iletypes?
 [GgCc]oroutine
+[Hh]ealthcheck
 [Hh]ostname
 [Ii]nfosec
+[Ii]nline
 [Kk]eyrings?
 [Ll]oopback
 [Mm]emcached
 [Mm]oby
+[Mm]ountpoint
 [Nn]amespace
 [Oo]nboarding
 [Pp]aravirtualization
@@ -121,10 +131,12 @@ Zsh
 [Pp]roxied
 [Pp]roxying
 [Rr]eal-time
+[Rr]egex(es)?
 [Rr]untimes?
 [Ss]andbox(ed)?
 [Ss]eccomp
 [Ss]ubmounts?
+[Ss]ubnet
 [Ss]ubpaths?
 [Ss]ubtrees?
 [Ss]wappable
@@ -145,6 +157,7 @@ Zsh
 cgroup
 config
 containerd
+datacenter
 deprovisioning
 deserialization
 deserialize
@@ -159,7 +172,6 @@ kubectl
 kubefwd
 kubelet
 lookup
-label_file
 macOS
 macvlan
 mfsymlinks
@@ -173,15 +185,19 @@ npm
 osquery
 osxfs
 pgAdmin
+rollback
 rootful
 runc
 snapshotters?
 stdin
 stdout
-subnet
+syntaxes
+sysctls
 systemd
 tmpfs
 ufw
+uid
 umask
 vSphere
 vpnkit
+windowsfilter