[pull] master from docker:master

.github/vale/Vocab/Industry/accept.txt

@@ -25,6 +25,7 @@ Kubernetes
 Lightstreamer
 Linux
 Logstash
+LTS
 Mac
 Mail(chimp|gun)
 Microsoft
@@ -38,9 +39,11 @@ Postgres
 PowerShell
 Python
 QEMU
+Raspbian
 RHEL
 S3
 SQLite
+SLES
 Slack
 Snyk
 Solr

.github/vale/Vocab/Technology/accept.txt

@@ -1,6 +1,7 @@
 APIs?
 Ethernet
 Git
+GPG
 HTTP
 IPs?
 IPv[46]
@@ -43,6 +44,7 @@ stdout
 subnet
 swappable
 systemd
+umask
 ungated
 virtiofs
 virtualize

.vale.ini

@@ -6,4 +6,4 @@ Vocab = Docker, Industry, Technology
 [*.md]
 BasedOnStyles = Vale, Docker
 TokenIgnores = ({%.*%}), \
-({:.*?})
+({:(?:.|\n)*?})

Gemfile.lock

@@ -76,12 +76,12 @@ GEM
       tomlrb
     mixlib-shellout (3.2.7)
       chef-utils
-    nokogiri (1.13.8)
+    nokogiri (1.13.9)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.13.8-aarch64-linux)
+    nokogiri (1.13.9-aarch64-linux)
       racc (~> 1.4)
-    nokogiri (1.13.8-x86_64-linux)
+    nokogiri (1.13.9-x86_64-linux)
       racc (~> 1.4)
     octopress-hooks (2.6.2)
       jekyll (>= 2.0)

_config.yml

@@ -41,7 +41,7 @@ exclude:
 latest_engine_api_version: "1.41"
 docker_ce_version: "20.10"
 compose_v1_version: "1.29.2"
-compose_version: "v2.11.2"
+compose_version: "v2.12.2"
 compose_file_v3: "3.9"
 compose_file_v2: "2.4"
 machine_version: "0.16.0"
@@ -172,10 +172,13 @@ fetch-remote:
       - dest: "build/building/drivers"
         src:
           - "docs/guides/drivers/**"
+      - dest: "build/building/cache/backends"
+        src:
+          - "docs/guides/cache/**"
 
   - repo: "https://github.com/distribution/distribution"
     default_branch: "main"
-    ref: "release/2.7"
+    ref: "main"
     paths:
       - dest: "registry/spec"
         src:

_data/compose-cli/docker_compose_push.yaml

@@ -33,6 +33,17 @@ options:
       experimentalcli: false
       kubernetes: false
       swarm: false
+    - option: quiet
+      shorthand: q
+      value_type: bool
+      default_value: "false"
+      description: Push without printing progress information
+      deprecated: false
+      hidden: false
+      experimental: false
+      experimentalcli: false
+      kubernetes: false
+      swarm: false
 deprecated: false
 experimental: false
 experimentalcli: false

_data/toc.yaml

@@ -18,7 +18,6 @@ horizontalnav:
 - title: Contribute
   path: /contribute/overview/
   node: contribute
-  # TODO unify navbbar links: homepage currently has a custom "articles" link
   hide_home: true
 
 home: {}
@@ -30,9 +29,9 @@ guides:
   path: /get-docker/
 - sectiontitle: Get started
   section:
-    - title: "Part 1: Getting started"
+    - title: "Part 1: Orientation and setup"
       path: /get-started/
-    - title: "Part 2: Sample application"
+    - title: "Part 2: Containerize an application"
       path: /get-started/02_our_app/
     - title: "Part 3: Update the application"
       path: /get-started/03_updating_app/
@@ -376,8 +375,6 @@ guides:
         title: Use the VFS storage driver
 - path: /get-started/resources/
   title: "Educational resources"
-- path: /opensource/
-  title: "Contribute to documentation"
 
 reference:
 - path: /reference/
@@ -1272,18 +1269,38 @@ manuals:
           title: Run Docker Desktop for Windows in a VM or VDI environment
         - path: /desktop/uninstall/
           title: Uninstall Docker Desktop
+    - sectiontitle: Hardened Desktop
+      section:
+        - path: /desktop/hardened-desktop/
+          title: Overview
+        - sectiontitle: Settings Management
+          section:
+          - path: /desktop/hardened-desktop/settings-management/
+            title: What is Settings Management?
+          - path: /desktop/hardened-desktop/settings-management/configure/
+            title: Configure Settings Management
+        - sectiontitle: Enhanced Container Isolation
+          section:
+          - path: /desktop/hardened-desktop/enhanced-container-isolation/
+            title: What is Enhanced Container Isolation?
+          - path: /desktop/hardened-desktop/enhanced-container-isolation/how-eci-works/
+            title: How does it work?
+          - path: /desktop/hardened-desktop/enhanced-container-isolation/features-benefits/
+            title: Key features and benefits
+          - path: /desktop/hardened-desktop/enhanced-container-isolation/faq/
+            title: FAQs and known issues
+        - path: /desktop/hardened-desktop/registry-access-management/
+          title: Registry Access Management
     - sectiontitle: Dev Environments (Beta)
       section:
         - path: /desktop/dev-environments/
           title: Overview
         - path: /desktop/dev-environments/create-dev-env/
-          title: Create a Dev Environment
+          title: Create a simple dev environment
         - path: /desktop/dev-environments/create-compose-dev-env/
-          title: Create a Compose Dev Environment
+          title: Create an advanced dev environment
         - path: /desktop/dev-environments/share/
-          title: Share your Dev Environment
-        - path: /desktop/dev-environments/specify/
-          title: Specify a Dockerfile or base image
+          title: Distribute your dev environment
     - sectiontitle: Extensions (Beta)
       section:
       - path: /desktop/extensions/
@@ -1340,6 +1357,8 @@ manuals:
                path: /desktop/extensions-sdk/design/mui-best-practices/
         - sectiontitle: Developer SDK tools
           section:
+            - title: Interacting with Kubernetes
+              path: /desktop/extensions-sdk/dev/kubernetes/          
             - title: Authentication
               path: /desktop/extensions-sdk/dev/oauth2-flow/
             - title: CLI reference
@@ -1360,6 +1379,8 @@ manuals:
                   path: /desktop/extensions-sdk/dev/api/reference/README/
     - path: /desktop/containerd/
       title: Containerd Image Store (Beta)
+    - path: /desktop/wasm/
+      title: Wasm (Beta)
     - sectiontitle: FAQs
       section:
       - path: /desktop/faqs/general/
@@ -1472,9 +1493,7 @@ manuals:
       section:
         - path: /build/building/packaging/
           title: Packaging your software
-        - path: /build/building/cache/
-          title: Optimizing builds with cache management
-        - sectiontitle: Choosing a build driver
+        - sectiontitle: Build drivers
           section:
             - path: /build/building/drivers/
               title: Overview
@@ -1486,13 +1505,31 @@ manuals:
               title: Kubernetes driver
             - path: /build/building/drivers/remote/
               title: Remote driver
+        - path: /build/building/cache/
+          title: Optimizing builds with cache
+        - sectiontitle: Cache backends
+          section:
+            - path: /build/building/cache/backends/
+              title: Overview
+            - path: /build/building/cache/backends/inline/
+              title: Inline
+            - path: /build/building/cache/backends/local/
+              title: Local
+            - path: /build/building/cache/backends/registry/
+              title: Registry
+            - path: /build/building/cache/backends/gha/
+              title: GitHub Actions
+            - path: /build/building/cache/backends/azblob/
+              title: Azure Blob Storage
+            - path: /build/building/cache/backends/s3/
+              title: Amazon S3
         - path: /build/building/multi-stage/
           title: Multi-stage builds
         - path: /build/building/multi-platform/
           title: Multi-platform images
     - sectiontitle: Customizing builds
       section:
-        - sectiontitle: Orchestrating builds with Bake
+        - sectiontitle: High-level builds with Bake
           section:
             - path: /build/customize/bake/
               title: Overview
@@ -1518,18 +1555,26 @@ manuals:
   section:
   - path: /compose/
     title: Overview
+  - path: /compose/features-uses/
+    title: Key features and use cases
   - sectiontitle: Install Docker Compose
     section:
       - path: /compose/install/
-        title: Install overview
+        title: Overview
       - path: /compose/install/linux/
-        title: Install on Linux
+        title: Install the Compose plugin
       - path: /compose/install/other/
-        title: Other install scenarios
+        title: Install the Compose standalone
       - path: /compose/install/uninstall/
-        title: Uninstall Docker Compose
+        title: Uninstall Compose
   - path: /compose/gettingstarted/
-    title: Getting started
+    title: Try Docker Compose
+  - sectiontitle: Compose V2
+    section:
+    - path: /compose/compose-v2/
+      title: Overview
+    - path: /compose/cli-command-compatibility/
+      title: Compose v2 compatibility
   - sectiontitle: Environment variables
     section:
     - path: /compose/environment-variables/
@@ -1552,8 +1597,6 @@ manuals:
     title: Control startup order
   - path: /compose/samples-for-compose/
     title: Sample apps with Compose
-  - path: /compose/cli-command-compatibility/
-    title: Compose v2 compatibility
   - path: /compose/release-notes/
     title: Release notes
 
@@ -1615,7 +1658,7 @@ manuals:
        title: Convert an account into an organization
      - path: /docker-hub/deactivate-account/
        title: Deactivate an account or an organization
-  - sectiontitle: Docker Verified Publisher Program
+  - sectiontitle: Docker Verified Publisher
     section:
       - path: /docker-hub/publish/
         title: Overview
@@ -1643,8 +1686,10 @@ manuals:
   section:
   - sectiontitle: Onboarding
     section:
+    - path: /docker-hub/onboard-team/
+      title: Team
     - path: /docker-hub/onboard-business/
-      title: Get started with Business
+      title: Business
     - path: /docker-hub/onboarding-faqs/
       title: FAQs
   - path: /docker-hub/orgs/
@@ -1663,8 +1708,7 @@ manuals:
     title: System for Cross-domain Identity Management
   - path: /docker-hub/image-access-management/
     title: Image Access Management
-  - path: /docker-hub/registry-access-management/
-    title: Registry Access Management
+
 
 - sectiontitle: Security
   section:
@@ -1788,16 +1832,20 @@ contribute:
       title: Voice and tone
   - path: /contribute/file-conventions/
     title: Source file conventions
+  - path: /contribute/ui/
+    title: UI elements in content
   - sectiontitle: Useful components
     section:
     - path: /contribute/components/accordions/
       title: Accordions
     - path: /contribute/components/badges/
       title: Badges
     - path: /contribute/components/call-outs/
-      title: Call outs
+      title: Callouts
     - path: /contribute/components/cards/
       title: Cards
+    - path: /contribute/components/code-blocks/
+      title: Code blocks
     - path: /contribute/components/images/
       title: Images
     - path: /contribute/components/links/

_includes/beta.md

@@ -0,0 +1,7 @@
+Beta features provide early access to future product functionality.
+These features are intended for testing and feedback only as they may change
+between releases without warning or can be removed entirely from a future
+release. Beta features must not be used in production environments.
+Docker does not offer support for beta features.
+
+For a list of current experimental features in the Docker CLI, see [Docker CLI Experimental features](https://github.com/docker/cli/blob/master/experimental/README.md).

_includes/configure-registry-json.md

@@ -66,7 +66,19 @@ To manually create a `registry.json` file, run the following PowerShell command
 PS>  Set-Content /ProgramData/DockerDesktop/registry.json '{"allowedOrgs":["myorg"]}'
 ```
 
-This creates the `registry.json` file at `C:\ProgramData\DockerDesktop\registry.json` and includes the organization information the user belongs to. Make sure this file can't be edited by the user, only by the administrator.
+This creates the `registry.json` file at `C:\ProgramData\DockerDesktop\registry.json` and includes the organization information the user belongs to. Make sure this file can't be edited by the user, only by the administrator:
+
+```console
+PS C:\ProgramData\DockerDesktop> Get-Acl .\registry.json
+
+
+    Directory: C:\ProgramData\DockerDesktop
+
+
+Path          Owner                  Access
+----          -----                  ------
+registry.json BUILTIN\Administrators NT AUTHORITY\SYSTEM Allow  FullControl...
+```
 
 </div>
 <div id="mac" class="tab-pane fade" markdown="1">