Merge branch 'main' into consolidated-plans-updates

Author: sarahsanders-docker

.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

Dockerfile

@@ -1,15 +1,15 @@
 # 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 NODE_VERSION=22
 ARG PAGEFIND_VERSION=1.1.1
 
 # base defines the generic base stage
-FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS base
+FROM golang:${GO_VERSION}-alpine AS base
 RUN apk add --no-cache \
     git \
     nodejs \

_vale/Docker/Acronyms.yml

@@ -129,4 +129,5 @@ exceptions:
   - XML
   - XSS
   - YAML
+  - ZFS
   - ZIP

_vale/config/vocabularies/Docker/accept.txt

@@ -66,6 +66,7 @@ Mac
 Mail(chimp|gun)
 Microsoft
 MySQL
+NFSv\d
 Netplan
 Nginx
 Nuxeo
@@ -121,10 +122,17 @@ Zsh
 [Rr]untimes?
 [Ss]andbox(ed)?
 [Ss]eccomp
+[Ss]ubmounts?
+[Ss]ubpaths?
+[Ss]ubtrees?
 [Ss]wappable
+[Ss]wappable
+[Ss]warm
 [Ss]warm
+[Ss]yscalls?
 [Ss]ysfs
 [Tt]oolchains?
+[Uu]narchived?
 [Vv]irtiofs
 [Vv]irtualize
 [Ww]alkthrough
@@ -169,6 +177,7 @@ tmpfs
 ufw
 umask
 ungated
+userland
 untrusted
 vSphere
 vpnkit