Merge pull request #21241 from docker/published-update

publish updates from main

Author: dvdksn

content/guides/java/containerize.md

@@ -68,7 +68,7 @@ WARNING: The following Docker files already exist in this directory:
 ? Do you want to overwrite them? Yes
 ? What application platform does your project use? Java
 ? What's the relative directory (with a leading .) for your app? ./src
-? What version of Java do you want to use? 17
+? What version of Java do you want to use? 21
 ? What port does your server listen on? 8080
 ```
 
@@ -98,7 +98,7 @@ Create a file named `Dockerfile` with the following contents.
 ################################################################################
 
 # Create a stage for resolving and downloading dependencies.
-FROM eclipse-temurin:17-jdk-jammy as deps
+FROM eclipse-temurin:21-jre-jammy as deps
 
 WORKDIR /build
 
@@ -155,7 +155,7 @@ RUN java -Djarmode=layertools -jar target/app.jar extract --destination target/e
 # most recent version of that tag when you build your Dockerfile.
 # If reproducibility is important, consider using a specific digest SHA, like
 # eclipse-temurin@sha256:99cede493dfd88720b610eb8077c8688d3cca50003d76d1d539b0efc8cca72b4.
-FROM eclipse-temurin:17-jre-jammy AS final
+FROM eclipse-temurin:21-jre-jammy AS final
 
 # Create a non-privileged user that the app will run under.
 # See https://docs.docker.com/go/dockerfile-user-best-practices/

content/guides/java/develop.md

@@ -121,7 +121,7 @@ Replace the contents of your Dockerfile with the following.
 ```dockerfile {hl_lines="22-29"}
 # syntax=docker/dockerfile:1
 
-FROM eclipse-temurin:17-jdk-jammy as deps
+FROM eclipse-temurin:21-jdk-jammy as deps
 WORKDIR /build
 COPY --chmod=0755 mvnw mvnw
 COPY .mvn/ .mvn/
@@ -149,7 +149,7 @@ RUN cp -r /build/target/extracted/application/. ./
 ENV JAVA_TOOL_OPTIONS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:8000
 CMD [ "java", "-Dspring.profiles.active=postgres", "org.springframework.boot.loader.launch.JarLauncher" ]
 
-FROM eclipse-temurin:17-jre-jammy AS final
+FROM eclipse-temurin:21-jre-jammy AS final
 ARG UID=10001
 RUN adduser \
     --disabled-password \

content/guides/java/run-tests.md

@@ -25,7 +25,7 @@ Replace the contents of your Dockerfile with the following.
 ```dockerfile {hl_lines="3-19"}
 # syntax=docker/dockerfile:1
 
-FROM eclipse-temurin:17-jdk-jammy as base
+FROM eclipse-temurin:21-jdk-jammy as base
 WORKDIR /build
 COPY --chmod=0755 mvnw mvnw
 COPY .mvn/ .mvn/
@@ -64,7 +64,7 @@ RUN cp -r /build/target/extracted/application/. ./
 ENV JAVA_TOOL_OPTIONS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:8000"
 CMD [ "java", "-Dspring.profiles.active=postgres", "org.springframework.boot.loader.launch.JarLauncher" ]
 
-FROM eclipse-temurin:17-jre-jammy AS final
+FROM eclipse-temurin:21-jre-jammy AS final
 ARG UID=10001
 RUN adduser \
     --disabled-password \

content/manuals/desktop/previous-versions/3.x-windows.md

@@ -43,7 +43,7 @@ This page contains release notes for Docker Desktop for Windows 3.x.
 - Fixed a bug where the DNS server would fail after receiving an unexpectedly large datagram.
 - Fixed spurious traces on iptables updates.
 - Fixed slowness when adding multiple ports forwarding option.
-- Fixed bug where the WSL 2 synchonization code creates dangling symlinks if the WSL 2 home directory if it is the same as the Windows home directory. Fixes [docker/for-win#11668](https://github.com/docker/for-win/issues/11668).
+- Fixed bug where the WSL 2 synchronization code creates dangling symlinks if the WSL 2 home directory if it is the same as the Windows home directory. Fixes [docker/for-win#11668](https://github.com/docker/for-win/issues/11668).
 - Fixed `docker context ls` after upgrade from 3.5.x when the Linux WSL 2 home directory is the same as the Windows home directory.
 - Fixed the permissions on `%PROGRAMDATA%\Docker` to avoid a potential Windows containers compromise. See [CVE-2021-37841](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-37841). Thanks to [Alessio Dalla Piazza](http://it.linkedin.com/in/alessiodallapiazza) for discovering the issue and to @kevpar for helpful discussion.
 - Fixed bug where the Linux home directory under WSL 2 was set to the Windows home directory e.g. `/mnt/c/Users/...`.

content/manuals/desktop/previous-versions/edge-releases-mac.md

@@ -913,7 +913,7 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus
   - Avoid hitting DNS timeouts when querying docker.for.mac.* when the upstream DNS servers are slow or missing.
   - Fix for `docker push` to an insecure registry. Fixes [docker/for-mac#2392](https://github.com/docker/for-mac/issues/2392)
   - Separate internal ports used to proxy HTTP and HTTPS content.
-  - If kubectl was already installed before Docker For Mac, restore the existing kubectl when sitching Kubernetes off in Docker for Mac.
+  - If kubectl was already installed before Docker For Mac, restore the existing kubectl when switching Kubernetes off in Docker for Mac.
   - Migration of Docker Toolbox images is not proposed anymore in Docker For Mac installer (still possible to migrate Toolbox images manually).
 
 

content/manuals/desktop/release-notes.md

@@ -34,17 +34,14 @@ Take a look at the [Docker Public Roadmap](https://github.com/orgs/docker/projec
 - Support for [Docker Desktop on Red Hat Enterprise Linux](/manuals/desktop/install/linux/rhel.md) is now generally available.
 - Volume Backup and Share is now generally available and can be found in the **Volumes** view.
 - Terminal support within Docker Desktop using system shells is now generally available.
-- containerd image store:
-  - Improved output of `docker image inspect` to account for multi-platform images.
-  - Support multi-platform images via enabling users to pick a specific platform in `docker history`.
 - Beta release of Docker VMM - the more performant alternative to Apple Virtualization Framework on macOS (requires Apple Silicon and macOS 12.5 or later).
 
 ### Upgrades
 
 - [containerd v1.7.21](https://github.com/containerd/containerd/releases/tag/v1.7.21)
 - [Docker Buildx v0.17.1](https://github.com/docker/buildx/releases/tag/v0.17.1)
 - [Docker Compose v2.29.7](https://github.com/docker/compose/releases/tag/v2.29.7)
-- [Docker Engine v27.3.1](https://docs.docker.com/engine/release-notes/27.3/#2731)
+- [Docker Engine v27.3.1](https://docs.docker.com/engine/release-notes/27/#2731)
 - [Docker Scout CLI v1.14.0](https://github.com/docker/scout-cli/releases/tag/v1.14.0)
 - Docker Debug `v0.0.37`
 - Linux kernel `v6.10.9`

content/manuals/engine/release-notes/18.06.md

@@ -136,12 +136,12 @@ toc_max: 2
 ### Networking
 
 * Allow user to specify default address pools for docker networks. [moby/moby#36396](https://github.com/moby/moby/pull/36396) [docker/cli#818](https://github.com/docker/cli/pull/818)
-* Adding logs for ipam state [doccker/libnetwork#2417](https://github.com/docker/libnetwork/pull/2147)
-* Fix race conditions in the overlay network driver [doccker/libnetwork#2143](https://github.com/docker/libnetwork/pull/2143)
-* Add wait time into xtables lock warning [doccker/libnetwork#2142](https://github.com/docker/libnetwork/pull/2142)
-* filter xtables lock warnings when firewalld is active [doccker/libnetwork#2135](https://github.com/docker/libnetwork/pull/2135)
-* Switch from x/net/context to context [doccker/libnetwork#2140](https://github.com/docker/libnetwork/pull/2140)
-* Adding a recovery mechanism for a split gossip cluster [doccker/libnetwork#2134](https://github.com/docker/libnetwork/pull/2134)
+* Adding logs for ipam state [docker/libnetwork#2417](https://github.com/docker/libnetwork/pull/2147)
+* Fix race conditions in the overlay network driver [docker/libnetwork#2143](https://github.com/docker/libnetwork/pull/2143)
+* Add wait time into xtables lock warning [docker/libnetwork#2142](https://github.com/docker/libnetwork/pull/2142)
+* filter xtables lock warnings when firewalld is active [docker/libnetwork#2135](https://github.com/docker/libnetwork/pull/2135)
+* Switch from x/net/context to context [docker/libnetwork#2140](https://github.com/docker/libnetwork/pull/2140)
+* Adding a recovery mechanism for a split gossip cluster [docker/libnetwork#2134](https://github.com/docker/libnetwork/pull/2134)
 * Running docker inspect on network attachment tasks now returns a full task object. [moby/moby#35246](https://github.com/moby/moby/pull/35246)
 * Some container/network cleanups. [moby/moby#37033](https://github.com/moby/moby/pull/37033)
 - Fix network inspect for overlay network. [moby/moby#37045](https://github.com/moby/moby/pull/37045)

content/manuals/engine/release-notes/18.09.md

@@ -172,7 +172,7 @@ toc_max: 2
 * Modified names in the container name generator. [docker/engine#159](https://github.com/docker/engine/pull/159)
 * When copying an existing folder, xattr set errors when the target filesystem doesn't support xattr are now ignored. [docker/engine#135](https://github.com/docker/engine/pull/135)
 * Graphdriver: fixed "device" mode not being detected if "character-device" bit is set. [docker/engine#160](https://github.com/docker/engine/pull/160)
-* Fixed nil pointer derefence on failure to connect to containerd. [docker/engine#162](https://github.com/docker/engine/pull/162)
+* Fixed nil pointer dereference on failure to connect to containerd. [docker/engine#162](https://github.com/docker/engine/pull/162)
 * Deleted stale containerd object on start failure. [docker/engine#154](https://github.com/docker/engine/pull/154)
 
 ### Known Issues

content/manuals/engine/release-notes/19.03.md

@@ -37,7 +37,7 @@ toc_max: 2
 
 ### Runtime
 
-- Return correct errors instead of spurrious -EINVAL [moby/moby#41293](https://github.com/moby/moby/pull/41293)
+- Return correct errors instead of spurious -EINVAL [moby/moby#41293](https://github.com/moby/moby/pull/41293)
 
 ### Rootless
 

content/manuals/engine/release-notes/27.md

@@ -350,7 +350,7 @@ For a full list of pull requests and changes in this release, refer to the relev
   - Starting in this release, when a bridge network is created with `--ipv6` and no IPv6 subnet is defined by those options, an IPv6 Unique Local Address (ULA) base prefix is used.
   - The ULA prefix is derived from the Engine host ID such that it's unique across hosts and over time.
 - IPv6 address pools of any size can now be added to `default-address-pools`. [moby/moby#47768](https://github.com/moby/moby/pull/47768)
-- IPv6 can now be enabled by default on all custom bridge networks using `"default-network-opts": { "bridge": {"com.docker.network.enable_ipv6": "true"}}` in `daemon.json`, or `dockerd --default-network-opt=bridge=com.docker.network.enable_ipv6=true`on the comand line. [moby/moby#47867](https://github.com/moby/moby/pull/47867)
+- IPv6 can now be enabled by default on all custom bridge networks using `"default-network-opts": { "bridge": {"com.docker.network.enable_ipv6": "true"}}` in `daemon.json`, or `dockerd --default-network-opt=bridge=com.docker.network.enable_ipv6=true`on the command line. [moby/moby#47867](https://github.com/moby/moby/pull/47867)
 - Direct routing for IPv6 networks, with `ip6tables` enabled. [moby/moby#47871](https://github.com/moby/moby/pull/47871)
   - Added bridge driver option `com.docker.network.bridge.gateway_mode_ipv6=<nat|routed>`.
   - The default behavior, `nat`, is unchanged from previous releases running with `ip6tables` enabled. NAT and masquerading rules are set up for each published container port.