Merge branch 'main' into ENGDOCS-2342b

docker · Dec 12, 2024 · 1e2b757 · 1e2b757
2 parents 92f6b06 + a0df667
commit 1e2b757
Show file tree

Hide file tree

Showing 184 changed files with 3,043 additions and 2,007 deletions.
diff --git a/.github/CODEOWNERS b/.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
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 # 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

diff --git a/_vale/Docker/Acronyms.yml b/_vale/Docker/Acronyms.yml
@@ -37,6 +37,7 @@ exceptions:
   - ELK
   - FAQ
   - FUSE
+  - GB
   - GCC
   - GDB
   - GET
@@ -128,4 +129,5 @@ exceptions:
   - XML
   - XSS
   - YAML
+  - ZFS
   - ZIP
diff --git a/_vale/config/vocabularies/Docker/accept.txt b/_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
diff --git a/_vendor/github.com/docker/cli/docs/reference/dockerd.md b/_vendor/github.com/docker/cli/docs/reference/dockerd.md
diff --git a/_vendor/github.com/docker/cli/docs/reference/run.md b/_vendor/github.com/docker/cli/docs/reference/run.md
diff --git a/_vendor/github.com/moby/moby/docs/api/v1.25.yaml b/_vendor/github.com/moby/moby/docs/api/v1.25.yaml
diff --git a/_vendor/github.com/moby/moby/docs/api/v1.26.yaml b/_vendor/github.com/moby/moby/docs/api/v1.26.yaml
diff --git a/_vendor/github.com/moby/moby/docs/api/v1.27.yaml b/_vendor/github.com/moby/moby/docs/api/v1.27.yaml
diff --git a/_vendor/github.com/moby/moby/docs/api/v1.28.yaml b/_vendor/github.com/moby/moby/docs/api/v1.28.yaml
diff --git a/_vendor/github.com/moby/moby/docs/api/v1.29.yaml b/_vendor/github.com/moby/moby/docs/api/v1.29.yaml
diff --git a/_vendor/github.com/moby/moby/docs/api/v1.30.yaml b/_vendor/github.com/moby/moby/docs/api/v1.30.yaml
diff --git a/_vendor/github.com/moby/moby/docs/api/v1.31.yaml b/_vendor/github.com/moby/moby/docs/api/v1.31.yaml
diff --git a/_vendor/github.com/moby/moby/docs/api/v1.32.yaml b/_vendor/github.com/moby/moby/docs/api/v1.32.yaml
diff --git a/_vendor/github.com/moby/moby/docs/api/v1.33.yaml b/_vendor/github.com/moby/moby/docs/api/v1.33.yaml
diff --git a/_vendor/github.com/moby/moby/docs/api/v1.34.yaml b/_vendor/github.com/moby/moby/docs/api/v1.34.yaml
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,6 +37,7 @@ exceptions: @@
       - ELK
       - FAQ
       - FUSE
+      - GB
       - GCC
       - GDB
       - GET
@@ Expand Down Expand Up / @@ -128,4 +129,5 @@ exceptions: @@
       - XML
       - XSS
       - YAML
+      - ZFS
       - ZIP