Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions .github/ISSUE_TEMPLATE/new_guide.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-githubs-form-schema
name: New guide
description: Propose a new guide for Docker docs
labels:
- area/guides
- kind/proposal

body:
- type: textarea
attributes:
label: Description
description: |
Briefly describe the topic that you would like us to cover.
validations:
required: true
- type: checkboxes
attributes:
label: Would you like to contribute this guide?
description: |
If you select this checkbox, you indicate that you're willing to
contribute this guide. If not, we will treat this issue as a request,
and someone (a Docker employee, Docker captain, or community member)
may pick it up and start working on it.
options:
- label: Yes
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
ARG ALPINE_VERSION=3.20
ARG GO_VERSION=1.23
ARG HTMLTEST_VERSION=0.17.0
ARG HUGO_VERSION=0.136.5
ARG HUGO_VERSION=0.138.0
ARG NODE_VERSION=22
ARG PAGEFIND_VERSION=1.1.1

Expand Down
1 change: 1 addition & 0 deletions _vale/config/vocabularies/Docker/accept.txt
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ Unix
VLAN
VM
VMware
VPN
WSL
Wasm
Windows
Expand Down
2 changes: 1 addition & 1 deletion _vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
# github.com/moby/buildkit v0.17.1-0.20241031124041-354f2d13c905
# github.com/docker/buildx v0.18.0
# github.com/docker/cli v27.3.2-0.20241107125754-eb986ae71b0c+incompatible
# github.com/docker/compose/v2 v2.30.2
# github.com/docker/compose/v2 v2.30.3
# github.com/docker/scout-cli v1.15.0
14 changes: 14 additions & 0 deletions content/manuals/compose/releases/release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,20 @@ aliases:

For more detailed information, see the [release notes in the Compose repo](https://github.com/docker/compose/releases/).

## 2.30.3

{{< release-date date="2024-11-07" >}}

### Update

- Dependencies upgrade: bump compose-go to v2.4.4

### Bug fixes and enhancements

- Fixed an issue re-starting services that should not when using `--watch`
- Improve the fix of using same YAML anchor multiple times in a Compose file


## 2.30.2

{{< release-date date="2024-11-05" >}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ title: Get support
weight: 20
aliases:
- /desktop/support/
- /support/
---

Find information on how to get support, and the scope of Docker Desktop support.
Expand Down
6 changes: 3 additions & 3 deletions content/manuals/engine/install/centos.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ $ sudo yum-config-manager --add-repo {{% param "download-url-base" %}}/docker-ce
```console
$ yum list docker-ce --showduplicates | sort -r

docker-ce.x86_64 3:27.1.1-1.el9 docker-ce-stable
docker-ce.x86_64 3:27.1.0-1.el9 docker-ce-stable
docker-ce.x86_64 3:27.3.1-1.el9 docker-ce-stable
docker-ce.x86_64 3:27.3.0-1.el9 docker-ce-stable
<...>
```

Expand All @@ -127,7 +127,7 @@ $ sudo yum-config-manager --add-repo {{% param "download-url-base" %}}/docker-ce

Install a specific version by its fully qualified package name, which is
the package name (`docker-ce`) plus the version string (2nd column),
separated by a hyphen (`-`). For example, `docker-ce-3:27.1.1-1.el9`.
separated by a hyphen (`-`). For example, `docker-ce-3:27.3.1-1.el9`.

Replace `<VERSION_STRING>` with the desired version and then run the following
command to install:
Expand Down
6 changes: 3 additions & 3 deletions content/manuals/engine/install/debian.md
Original file line number Diff line number Diff line change
Expand Up @@ -155,15 +155,15 @@ Docker from the repository.
# List the available versions:
$ apt-cache madison docker-ce | awk '{ print $3 }'

5:27.1.1-1~debian.12~bookworm
5:27.1.0-1~debian.12~bookworm
5:27.3.1-1~debian.12~bookworm
5:27.3.0-1~debian.12~bookworm
...
```

Select the desired version and install:

```console
$ VERSION_STRING=5:27.1.1-1~debian.12~bookworm
$ VERSION_STRING=5:27.3.1-1~debian.12~bookworm
$ sudo apt-get install docker-ce=$VERSION_STRING docker-ce-cli=$VERSION_STRING containerd.io docker-buildx-plugin docker-compose-plugin
```

Expand Down
8 changes: 4 additions & 4 deletions content/manuals/engine/install/fedora.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ To get started with Docker Engine on Fedora, make sure you
To install Docker Engine, you need a maintained version of one of the following
Fedora versions:

- Fedora 39
- Fedora 40
- Fedora 41

### Uninstall old versions

Expand Down Expand Up @@ -114,8 +114,8 @@ $ sudo dnf-3 config-manager --add-repo {{% param "download-url-base" %}}/docker-
```console
$ dnf list docker-ce --showduplicates | sort -r

docker-ce.x86_64 3:27.1.1-1.fc40 docker-ce-stable
docker-ce.x86_64 3:27.1.0-1.fc40 docker-ce-stable
docker-ce.x86_64 3:27.3.1-1.fc41 docker-ce-stable
docker-ce.x86_64 3:27.3.0-1.fc41 docker-ce-stable
<...>
```

Expand All @@ -124,7 +124,7 @@ $ sudo dnf-3 config-manager --add-repo {{% param "download-url-base" %}}/docker-

Install a specific version by its fully qualified package name, which is
the package name (`docker-ce`) plus the version string (2nd column),
separated by a hyphen (`-`). For example, `docker-ce-3:27.1.1-1.fc40`.
separated by a hyphen (`-`). For example, `docker-ce-3:27.3.1-1.fc41`.

Replace `<VERSION_STRING>` with the desired version and then run the following
command to install:
Expand Down
6 changes: 3 additions & 3 deletions content/manuals/engine/install/raspberry-pi-os.md
Original file line number Diff line number Diff line change
Expand Up @@ -143,15 +143,15 @@ Docker from the repository.
# List the available versions:
$ apt-cache madison docker-ce | awk '{ print $3 }'

5:27.1.1-1~raspbian.12~bookworm
5:27.1.0-1~raspbian.12~bookworm
5:27.3.1-1~raspbian.12~bookworm
5:27.3.0-1~raspbian.12~bookworm
...
```

Select the desired version and install:

```console
$ VERSION_STRING=5:27.1.1-1~raspbian.12~bookworm
$ VERSION_STRING=5:27.3.1-1~raspbian.12~bookworm
$ sudo apt-get install docker-ce=$VERSION_STRING docker-ce-cli=$VERSION_STRING containerd.io docker-buildx-plugin docker-compose-plugin
```

Expand Down
6 changes: 3 additions & 3 deletions content/manuals/engine/install/rhel.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@ $ sudo yum-config-manager --add-repo {{% param "download-url-base" %}}/docker-ce
```console
$ yum list docker-ce --showduplicates | sort -r

docker-ce.x86_64 3:27.1.1-1.el9 docker-ce-stable
docker-ce.x86_64 3:27.1.0-1.el9 docker-ce-stable
docker-ce.x86_64 3:27.3.1-1.el9 docker-ce-stable
docker-ce.x86_64 3:27.3.0-1.el9 docker-ce-stable
<...>
```

Expand All @@ -128,7 +128,7 @@ $ sudo yum-config-manager --add-repo {{% param "download-url-base" %}}/docker-ce

Install a specific version by its fully qualified package name, which is
the package name (`docker-ce`) plus the version string (2nd column),
separated by a hyphen (`-`). For example, `docker-ce-3:27.1.1-1.el9`.
separated by a hyphen (`-`). For example, `docker-ce-3:27.3.1-1.el9`.

Replace `<VERSION_STRING>` with the desired version and then run the following
command to install:
Expand Down
6 changes: 3 additions & 3 deletions content/manuals/engine/install/sles.md
Original file line number Diff line number Diff line change
Expand Up @@ -138,16 +138,16 @@ $ sudo zypper addrepo {{% param "download-url-base" %}}/docker-ce.repo
```console
$ sudo zypper search -s --match-exact docker-ce | sort -r

v | docker-ce | package | 3:27.0.3-1 | s390x | Docker CE Stable - s390x
v | docker-ce | package | 3:27.0.2-1 | s390x | Docker CE Stable - s390x
v | docker-ce | package | 3:27.3.1-1 | s390x | Docker CE Stable - s390x
v | docker-ce | package | 3:27.3.0-1 | s390x | Docker CE Stable - s390x
```

The list returned depends on which repositories are enabled, and is specific
to your version of SLES.

Install a specific version by its fully qualified package name, which is
the package name (`docker-ce`) plus the version string (2nd column),
separated by a hyphen (`-`). For example, `docker-ce-3:27.0.3`.
separated by a hyphen (`-`). For example, `docker-ce-3:27.3.1`.

Replace `<VERSION_STRING>` with the desired version and then run the following
command to install:
Expand Down
5 changes: 3 additions & 2 deletions content/manuals/engine/install/ubuntu.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ To get started with Docker Engine on Ubuntu, make sure you
To install Docker Engine, you need the 64-bit version of one of these Ubuntu
versions:

- Ubuntu Oracular 24.10
- Ubuntu Noble 24.04 (LTS)
- Ubuntu Jammy 22.04 (LTS)
- Ubuntu Focal 20.04 (LTS)
Expand Down Expand Up @@ -157,8 +158,8 @@ Docker from the repository.
# List the available versions:
$ apt-cache madison docker-ce | awk '{ print $3 }'

5:27.1.1-1~ubuntu.24.04~noble
5:27.1.0-1~ubuntu.24.04~noble
5:27.3.1-1~ubuntu.24.04~noble
5:27.3.0-1~ubuntu.24.04~noble
...
```

Expand Down
37 changes: 19 additions & 18 deletions content/reference/api/engine/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,23 +72,23 @@ To see the highest version of the API your Docker daemon and client support, use

```console
$ docker version
Client: Docker Engine - Community
Version: 27.1.2
API version: 1.46
Go version: go1.21.13
Git commit: d01f264
Built: Mon Aug 12 11:51:13 2024
OS/Arch: linux/amd64
Context: default

Server: Docker Engine - Community
Client:
Version: 27.3.1
API version: 1.47
Go version: go1.22.7
Git commit: ce12230
Built: Fri Sep 20 11:38:18 2024
OS/Arch: darwin/arm64
Context: desktop-linux

Server: Docker Desktop 4.36.0 (172961)
Engine:
Version: 27.1.2
API version: 1.46 (minimum version 1.24)
Go version: go1.21.13
Git commit: f9522e5
Built: Mon Aug 12 11:51:13 2024
OS/Arch: linux/amd64
Version: 27.3.1
API version: 1.47 (minimum version 1.24)
Go version: go1.22.7
Git commit: 41ca978
Built: Fri Sep 20 11:41:19 2024
OS/Arch: linux/arm64
Experimental: false
...
```
Expand All @@ -99,14 +99,14 @@ You can specify the API version to use in any of the following ways:
that incorporates the API version with the features you need.
- When using `curl` directly, specify the version as the first part of the URL.
For instance, if the endpoint is `/containers/` you can use
`/v1.46/containers/`.
`/v1.47/containers/`.
- To force the Docker CLI or the Docker Engine SDKs to use an older version
of the API than the version reported by `docker version`, set the
environment variable `DOCKER_API_VERSION` to the correct version. This works
on Linux, Windows, or macOS clients.

```console
$ DOCKER_API_VERSION='1.44'
$ DOCKER_API_VERSION=1.46
```

While the environment variable is set, that version of the API is used, even
Expand All @@ -127,6 +127,7 @@ You can specify the API version to use in any of the following ways:

| Docker version | Maximum API version | Change log |
|:---------------|:---------------------------|:-----------------------------------------------------------------------------|
| 27.3 | [1.47](/reference/api/engine/version/v1.47/) | [changes](/reference/api/engine/version-history/#v147-api-changes) |
| 27.2 | [1.47](/reference/api/engine/version/v1.47/) | [changes](/reference/api/engine/version-history/#v147-api-changes) |
| 27.1 | [1.46](/reference/api/engine/version/v1.46/) | [changes](/reference/api/engine/version-history/#v146-api-changes) |
| 27.0 | [1.46](/reference/api/engine/version/v1.46/) | [changes](/reference/api/engine/version-history/#v146-api-changes) |
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.23.1
require (
github.com/docker/buildx v0.18.0 // indirect
github.com/docker/cli v27.3.2-0.20241107125754-eb986ae71b0c+incompatible // indirect
github.com/docker/compose/v2 v2.30.2 // indirect
github.com/docker/compose/v2 v2.30.3 // indirect
github.com/docker/scout-cli v1.15.0 // indirect
github.com/moby/buildkit v0.17.1-0.20241031124041-354f2d13c905 // indirect
github.com/moby/moby v27.3.1+incompatible // indirect
Expand All @@ -14,7 +14,7 @@ require (
replace (
github.com/docker/buildx => github.com/docker/buildx v0.18.0
github.com/docker/cli => github.com/docker/cli v27.3.2-0.20241107125754-eb986ae71b0c+incompatible
github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.30.2
github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.30.3
github.com/docker/scout-cli => github.com/docker/scout-cli v1.15.0
github.com/moby/buildkit => github.com/moby/buildkit v0.17.1-0.20241031124041-354f2d13c905
github.com/moby/moby => github.com/moby/moby v27.3.1+incompatible
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,8 @@ github.com/docker/compose/v2 v2.30.1 h1:AwDaEcmgskxaI75Wjt3KL6/Xqq/GXKUQcBpo/RqM
github.com/docker/compose/v2 v2.30.1/go.mod h1:pt/uv8KQ6VaM0IbHZwB1UdwDIs9PB4nN4LoWst+dqXc=
github.com/docker/compose/v2 v2.30.2 h1:7PypFsyl5wjlSeOyx3LCb8XMcAGkb+D0fqM47OIKe8I=
github.com/docker/compose/v2 v2.30.2/go.mod h1:ND4+yaNoJ3Jh1OgrEO64uzMq/VKRqBkMS8zpb65Fve8=
github.com/docker/compose/v2 v2.30.3 h1:e8H7xGLCZOeFo46GEtyDGHlkBbNgXqbXKIXPOSL8cfU=
github.com/docker/compose/v2 v2.30.3/go.mod h1:ayPsSsRSc5WpVFehPrTDFuljAydxaf8g0aM9UKbaMXk=
github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
Expand Down
4 changes: 2 additions & 2 deletions hugo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ params:
docs_url: https://docs.docker.com

latest_engine_api_version: "1.47"
docker_ce_version: "27.2.1"
compose_version: "v2.30.2"
docker_ce_version: "27.3.1"
compose_version: "v2.30.3"
compose_file_v3: "3.8"
compose_file_v2: "2.4"
buildkit_version: "0.16.0"
Expand Down
18 changes: 9 additions & 9 deletions layouts/_default/cli.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
{{ else }}
{{ $data = index site.Data .Params.datafile }}
{{ end }}
{{ .Scratch.Set "headings" slice }}
{{ .Scratch.Set "subheadings" slice }}
{{ .Store.Set "headings" slice }}
{{ .Store.Set "subheadings" slice }}
<div class="flex w-full">
<article class="prose min-w-0 flex-[2_2_0%] max-w-4xl dark:prose-invert">
{{ partial "breadcrumbs.html" . }}
Expand Down Expand Up @@ -84,11 +84,11 @@ <h1 class="scroll-mt-36">{{ .Title }}</h1>
{{ $heading := dict "level" 2 "text" "Description" }}
{{ partialCached "heading.html" $heading "cli-description" }}
{{ $subHeadings := (strings.FindRE `(?m:#{3,4} .*)` .) }}
{{ $.Scratch.Add "headings" $heading }}
{{ $.Store.Add "headings" $heading }}
{{ range $subHeadings }}
{{ $lvl := strings.Count "#" . }}
{{ $txt := strings.TrimLeft "# " . }}
{{ $.Scratch.Add "headings" (dict "level" $lvl "text" $txt) }}
{{ $.Store.Add "headings" (dict "level" $lvl "text" $txt) }}
{{ end }}
{{ . | $.RenderString (dict "display" "block") }}
{{ end }}
Expand All @@ -97,7 +97,7 @@ <h1 class="scroll-mt-36">{{ .Title }}</h1>
{{ with $opts }}
{{ $heading := dict "level" 2 "text" "Options" }}
{{ partialCached "heading.html" $heading "cli-options" }}
{{ $.Scratch.Add "headings" $heading }}
{{ $.Store.Add "headings" $heading }}
<div class="overflow-x-auto">
<table>
<thead class="bg-gray-light-100 dark:bg-gray-dark-200">
Expand Down Expand Up @@ -162,18 +162,18 @@ <h1 class="scroll-mt-36">{{ .Title }}</h1>
{{ $heading := dict "level" 2 "text" "Examples" }}
{{ partialCached "heading.html" $heading "cli-examples" }}
{{ $subHeadings := (strings.FindRE `(?m:#{3,4} .*)` .) }}
{{ $.Scratch.Add "headings" $heading }}
{{ $.Store.Add "headings" $heading }}
{{ range $subHeadings }}
{{ $lvl := strings.Count "#" . }}
{{ $txt := strings.TrimLeft "# " . }}
{{ $.Scratch.Add "headings" (dict "level" $lvl "text" $txt) }}
{{ $.Store.Add "headings" (dict "level" $lvl "text" $txt) }}
{{ end }}
{{ $.RenderString (dict "display" "block") . }}
{{ end }}
{{ if eq .Kind "section" }}
{{ $heading := dict "level" 2 "text" "Subcommands" }}
{{ partialCached "heading.html" $heading "cli-subcommands" }}
{{ $.Scratch.Add "headings" $heading }}
{{ $.Store.Add "headings" $heading }}
<table>
<thead>
<tr>
Expand Down Expand Up @@ -202,7 +202,7 @@ <h1 class="scroll-mt-36">{{ .Title }}</h1>
<div class="text-lg pb-2">{{ T "tableOfContents" }}</div>
<nav class="toc">
<ul>
{{ range (.Scratch.Get "headings") }}
{{ range (.Store.Get "headings") }}
{{/* add left padding depending on level (pl-2, pl-3, pl-4) */}}
{{ $slice := strings.Split .text "{#" }}
{{ $text := index $slice 0 }}
Expand Down
Loading
Loading