Merge pull request #21021 from docker/published-update

publish updates from main

Author: dvdksn

.vale.ini

@@ -3,7 +3,15 @@ MinAlertLevel = suggestion
 
 Vocab = Docker
 
-Packages = Hugo
-
 [*.md]
 BasedOnStyles = Vale, Docker
+# Exclude `{{< ... >}}`, `{{% ... %}}`, [Who]({{< ... >}})
+TokenIgnores = ({{[%<] .* [%>]}}.*?{{[%<] ?/.* [%>]}}), \
+(\[.+\]\({{< .+ >}}\)), \
+[^\S\r\n]({{[%<] \w+ .+ [%>]}})\s, \
+[^\S\r\n]({{[%<](?:/\*) .* (?:\*/)[%>]}})\s, \
+(?sm)({{[%<] .*?\s[%>]}})
+
+# Exclude `{{< myshortcode `This is some <b>HTML</b>, ... >}}`
+BlockIgnores = (?sm)^({{[%<] \w+ [^{]*?\s[%>]}})\n$, \
+(?s) *({{< highlight [^>]* ?>}}.*?{{< ?/ ?highlight >}})

Dockerfile

@@ -4,7 +4,7 @@
 # ALPINE_VERSION sets the Alpine Linux version for all Alpine stages
 ARG ALPINE_VERSION=3.20
 # GO_VERSION sets the Go version for the base stage
-ARG GO_VERSION=1.22
+ARG GO_VERSION=1.23
 # HTML_TEST_VERSION sets the wjdp/htmltest version for HTML testing
 ARG HTMLTEST_VERSION=0.17.0
 
@@ -21,7 +21,7 @@ RUN npm install
 
 # hugo downloads and extracts the Hugo binary
 FROM base AS hugo
-ARG HUGO_VERSION=0.132.0
+ARG HUGO_VERSION=0.134.3
 ARG TARGETARCH
 WORKDIR /tmp/hugo
 RUN wget -O "hugo.tar.gz" "https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-${TARGETARCH}.tar.gz"
@@ -45,7 +45,7 @@ ARG DOCS_URL
 RUN hugo --gc --minify -d /out -e $HUGO_ENV -b $DOCS_URL
 
 # lint lints markdown files
-FROM davidanson/markdownlint-cli2:v0.13.0 AS lint
+FROM davidanson/markdownlint-cli2:v0.14.0 AS lint
 USER root
 RUN --mount=type=bind,target=. \
     /usr/local/bin/markdownlint-cli2 \
@@ -123,7 +123,7 @@ EOT
 
 # pagefind installs the Pagefind runtime
 FROM base AS pagefind
-ARG PAGEFIND_VERSION=1.1.0
+ARG PAGEFIND_VERSION=1.1.1
 COPY --from=build /out ./public
 RUN --mount=type=bind,src=pagefind.yml,target=pagefind.yml \
     npx pagefind@v${PAGEFIND_VERSION} --output-path "/pagefind"

_vale/Docker/Acronyms.yml

@@ -4,13 +4,14 @@ link: https://docs.docker.com/contribute/style/grammar/#acronyms-and-initialisms
 level: warning
 ignorecase: false
 # Ensures that the existence of 'first' implies the existence of 'second'.
-first: '\b[^!]([A-Z]{3,5})\b'
-second: '(?:\b[A-Za-z]+(?: |\n))+\(([A-Z]{3,5})\)'
+first: '\b([A-Z]{3,5})\b'
+second: '(?:\b[A-Z][a-z]+ )+\(([A-Z]{3,5})\)'
 # ... with the exception of these:
 exceptions:
   - API
   - ARM
   - ASP
+  - AUFS
   - AWS
   - BIOS
   - CLI
@@ -45,6 +46,7 @@ exceptions:
   - LESS
   - LLDB
   - NET
+  - NFS
   - NOTE
   - NVDA
   - OSS
@@ -62,16 +64,19 @@ exceptions:
   - SCSS
   - SDK
   - SQL
+  - SSD
   - SSH
   - SSL
   - SVG
   - TBD
   - TCP
+  - TIP
   - TODO
   - TTY
   - URI
   - URL
   - USB
+  - USD
   - UTF
   - VAT
   - WSL

_vale/config/vocabularies/Docker/accept.txt

@@ -1,7 +1,6 @@
 A?GPL(v3)?
 APIs?
 ARM
-Netplan
 AWS
 Admin Console
 Amazon
@@ -12,6 +11,7 @@ Artifactory
 Autobuild
 Autotest
 Azure
+Btrfs
 BuildKit
 BusyBox
 CISA
@@ -35,7 +35,6 @@ Ddosify
 Debootstrap
 Dev Environments?
 Django
-Docker's
 Docker Build Cloud
 Docker Business
 Docker Dasboard
@@ -45,6 +44,7 @@ Docker Extension
 Docker Hub
 Docker Scout
 Docker Team
+Docker's
 Docker-Sponsored Open Source
 Dockerfile
 Dockerize
@@ -83,6 +83,7 @@ Mail(chimp|gun)
 Microsoft
 MySQL
 NAT
+Netplan
 Nginx
 Nuxeo
 OAuth
@@ -176,6 +177,7 @@ npm
 osquery
 osxfs
 runc
+snapshotters?
 stdin
 stdout
 subnet

_vendor/modules.txt

@@ -1,6 +1,6 @@
 # github.com/moby/moby v27.3.1+incompatible
 # github.com/moby/buildkit v0.16.0
-# github.com/docker/buildx v0.17.0
+# github.com/docker/buildx v0.17.1
 # github.com/docker/cli v27.3.1+incompatible
 # github.com/docker/compose/v2 v2.29.6
 # github.com/docker/scout-cli v1.13.0

content/contribute/components/icons.md

@@ -57,11 +57,11 @@ grid:
     icon: "database"
     description: Icon name = database
   - title: "logs"
-    icon: "feed"
-    description: Icon name = feed
+    icon: "text_snippet"
+    description: Icon name = text_snippet
   - title: "Prune/cut"
-    icon: "cut"
-    description: Icon name = cut
+    icon: "content_cut"
+    description: Icon name = content_cut
   - title: "Configure"
     icon: "tune"
     description: Icon name = tune

content/get-started/docker-concepts/building-images/multi-stage-builds.md

@@ -75,8 +75,6 @@ In this hands-on guide, you'll unlock the power of multi-stage builds to create
 
     ```plaintext
     spring-boot-docker
-    ├── Dockerfile
-    ├── Dockerfile.multi
     ├── HELP.md
     ├── mvnw
     ├── mvnw.cmd
@@ -86,7 +84,7 @@ In this hands-on guide, you'll unlock the power of multi-stage builds to create
         │   ├── java
         │   │   └── com
         │   │       └── example
-        │   │           └── springbootdocker
+        │   │           └── spring_boot_docker
         │   │               └── SpringBootDockerApplication.java
         │   └── resources
         │       ├── application.properties
@@ -96,10 +94,10 @@ In this hands-on guide, you'll unlock the power of multi-stage builds to create
             └── java
                 └── com
                     └── example
-                        └── springbootdocker
+                        └── spring_boot_docker
                             └── SpringBootDockerApplicationTests.java
     
-    15 directories, 9 files
+    15 directories, 7 files
     ```
 
    The `src/main/java` directory contains your project's source code, the `src/test/java` directory   
@@ -112,12 +110,12 @@ In this hands-on guide, you'll unlock the power of multi-stage builds to create
 4. Create a RESTful web service that displays "Hello World!". 
 
     
-    Under the `src/main/java/com/example/springbootdocker/` directory, you can modify your  
+    Under the `src/main/java/com/example/spring_boot_docker/` directory, you can modify your  
     `SpringBootDockerApplication.java` file with the following content:
 
 
     ```java
-    package com.example.springbootdocker;
+    package com.example.spring_boot_docker;
 
     import org.springframework.boot.SpringApplication;
     import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -141,7 +139,7 @@ In this hands-on guide, you'll unlock the power of multi-stage builds to create
     }
     ```
 
-    The `SpringbootDockerApplication.java` file starts by declaring your `com.example.springbootdocker` package and importing necessary Spring frameworks. This Java file creates a simple Spring Boot web application that responds with "Hello World" when a user visits its homepage. 
+    The `SpringbootDockerApplication.java` file starts by declaring your `com.example.spring_boot_docker` package and importing necessary Spring frameworks. This Java file creates a simple Spring Boot web application that responds with "Hello World" when a user visits its homepage. 
 
 
 ### Create the Dockerfile
@@ -238,20 +236,21 @@ Now that you have the project, you’re ready to create the `Dockerfile`.
     You'll then see output similar to the following in the container log:
 
     ```plaintext
-    [INFO] --- spring-boot:3.3.0-M3:run (default-cli) @ spring-boot-docker ---
+    [INFO] --- spring-boot:3.3.4:run (default-cli) @ spring-boot-docker ---
     [INFO] Attaching agents: []
-     .   ____          _            __ _ _
-     /\\ / ___'_ __ _ _(_)_ __  __ _ \ \ \ \
-     ( ( )\___ | '_ | '_| | '_ \/ _` | \ \ \ \
-     \\/  ___)| |_)| | | | | || (_| |  ) ) ) )
-     '  |____| .__|_| |_|_| |_\__, | / / / /
-      =========|_|==============|___/=/_/_/_/
-
-     :: Spring Boot ::             (v3.3.0-M3)
-
-     2024-04-04T15:36:47.202Z  INFO 42 --- [spring-boot-docker] [           main]       
-     c.e.s.SpringBootDockerApplication        : Starting SpringBootDockerApplication using Java    
-     21.0.2 with PID 42 (/app/target/classes started by root in /app)
+    
+         .   ____          _            __ _ _
+        /\\ / ___'_ __ _ _(_)_ __  __ _ \ \ \ \
+       ( ( )\___ | '_ | '_| | '_ \/ _` | \ \ \ \
+        \\/  ___)| |_)| | | | | || (_| |  ) ) ) )
+         '  |____| .__|_| |_|_| |_\__, | / / / /
+        =========|_|==============|___/=/_/_/_/
+    
+        :: Spring Boot ::                (v3.3.4)
+    
+    2024-09-29T23:54:07.157Z  INFO 159 --- [spring-boot-docker] [           main]
+    c.e.s.SpringBootDockerApplication        : Starting SpringBootDockerApplication using Java
+    21.0.2 with PID 159 (/app/target/classes started by root in /app)
      ….
      ```
 

content/get-started/workshop/08_using_compose.md

@@ -36,7 +36,7 @@ In the `getting-started-app` directory, create a file named `compose.yaml`.
 
 ## Define the app service
 
-In [part 7](./07_multi_container.md), you used the following command to start the application service.
+In [part 6](./07_multi_container.md), you used the following command to start the application service.
 
 ```console
 $ docker run -dp 127.0.0.1:3000:3000 \

content/manuals/admin/organization/_index.md

@@ -15,7 +15,7 @@ grid:
   link: /admin/organization/members/
 - title: Activity logs
   description: Learn how to audit the activities of your members.
-  icon: feed
+  icon: text_snippet
   link: /admin/organization/activity-logs/
 - title: Image Access Management
   description: Control which types of images your developers can pull.

content/manuals/desktop/install/msi/faq.md

@@ -42,3 +42,35 @@ You can suppress reboots by using the `/norestart` option when launching the ins
 ```powershell
 msiexec /i "DockerDesktop.msi" /L*V ".\msi.log" /norestart
 ```
+
+### Why isn't the `docker-users` group populated when the MSI is installed with Intune or another MDM solution?
+
+It's common for MDM solutions to install applications in the context of the system account. This means that the `docker-users` group isn't populated with the user's account, as the system account doesn't have access to the user's context.
+
+As an example, you can reproduce this by running the installer with `psexec` in an elevated command prompt:
+
+```powershell
+psexec -i -s msiexec /i "DockerDesktop.msi"
+```
+The installation should complete successfully, but the `docker-users` group won't be populated.
+
+As a workaround, you can create a script that runs in the context of the user account. 
+
+The script would be responsible for creating the `docker-users` group and populating it with the correct user.
+
+Here's an example script that creates the `docker-users` group and adds the current user to it (requirements may vary depending on environment):
+
+```powershell
+$Group = "docker-users"
+$CurrentUser = [System.Security.Principal.WindowsIdentity]::GetCurrent().Name
+
+# Create the group
+New-LocalGroup -Name $Group
+
+# Add the user to the group
+Add-LocalGroupMember -Group $Group -Member $CurrentUser
+```
+
+> [!NOTE]
+>
+> After adding a new user to the `docker-users` group, the user must sign out and then sign back in for the changes to take effect.