Skip to content

Commit eb0b70b

Browse files
craig-osterhoutcraig-osterhout
authored
Merge pull request #21609 from docker/published-update
publish updates from main
2 parents f160c97 + ccf45cd commit eb0b70b

File tree

10 files changed

+26
-27
lines changed

10 files changed

+26
-27
lines changed

‎content/manuals/docker-hub/service-accounts.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ weight: 50
2020
2121
A service account is a Docker ID used for automated management of container images or containerized applications. Service accounts are typically used in automated workflows, and don't share Docker IDs with the members in the organization. Common use cases for service accounts include mirroring content on Docker Hub, or tying in image pulls from your CI/CD process.
2222

23-
> [!NOTE]
24-
>
25-
> All paid Docker subscriptions include up to 5000 pulls per day per authenticated user. If you require a higher number of pulls, you can purchase an Enhanced Service Account add-on. Note that you can only purchase an Enhanced Service Account add-on if you are on a current Service Account agreement.
26-
2723
## Enhanced Service Account add-on tiers
2824

2925
Refer to the following table for details on the Enhanced Service Account add-ons:

‎content/manuals/engine/install/centos.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ $ sudo dnf config-manager --add-repo {{% param "download-url-base" %}}/docker-ce
119119
```console
120120
$ dnf list docker-ce --showduplicates | sort -r
121121

122-
docker-ce.x86_64 3:27.4.0-1.el9 docker-ce-stable
123-
docker-ce.x86_64 3:27.3.1-1.el9 docker-ce-stable
122+
docker-ce.x86_64 3:{{% param "docker_ce_version" %}}-1.el9 docker-ce-stable
123+
docker-ce.x86_64 3:{{% param "docker_ce_version_prev" %}}-1.el9 docker-ce-stable
124124
<...>
125125
```
126126

@@ -129,7 +129,7 @@ $ sudo dnf config-manager --add-repo {{% param "download-url-base" %}}/docker-ce
129129

130130
Install a specific version by its fully qualified package name, which is
131131
the package name (`docker-ce`) plus the version string (2nd column),
132-
separated by a hyphen (`-`). For example, `docker-ce-3:27.4.0-1.el9`.
132+
separated by a hyphen (`-`). For example, `docker-ce-3:{{% param "docker_ce_version" %}}-1.el9`.
133133

134134
Replace `<VERSION_STRING>` with the desired version and then run the following
135135
command to install:

‎content/manuals/engine/install/debian.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,15 +155,15 @@ Docker from the repository.
155155
# List the available versions:
156156
$ apt-cache madison docker-ce | awk '{ print $3 }'
157157

158-
5:27.4.0-1~debian.12~bookworm
159-
5:27.3.1-1~debian.12~bookworm
158+
5:{{% param "docker_ce_version" %}}-1~debian.12~bookworm
159+
5:{{% param "docker_ce_version_prev" %}}-1~debian.12~bookworm
160160
...
161161
```
162162

163163
Select the desired version and install:
164164

165165
```console
166-
$ VERSION_STRING=5:27.4.0-1~debian.12~bookworm
166+
$ VERSION_STRING=5:{{% param "docker_ce_version" %}}-1~debian.12~bookworm
167167
$ sudo apt-get install docker-ce=$VERSION_STRING docker-ce-cli=$VERSION_STRING containerd.io docker-buildx-plugin docker-compose-plugin
168168
```
169169

‎content/manuals/engine/install/fedora.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ $ sudo dnf-3 config-manager --add-repo {{% param "download-url-base" %}}/docker-
116116
```console
117117
$ dnf list docker-ce --showduplicates | sort -r
118118

119-
docker-ce.x86_64 3:27.4.0-1.fc41 docker-ce-stable
120-
docker-ce.x86_64 3:27.3.1-1.fc41 docker-ce-stable
119+
docker-ce.x86_64 3:{{% param "docker_ce_version" %}}-1.fc41 docker-ce-stable
120+
docker-ce.x86_64 3:{{% param "docker_ce_version_prev" %}}-1.fc41 docker-ce-stable
121121
<...>
122122
```
123123

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

127127
Install a specific version by its fully qualified package name, which is
128128
the package name (`docker-ce`) plus the version string (2nd column),
129-
separated by a hyphen (`-`). For example, `docker-ce-3:27.4.0-1.fc41`.
129+
separated by a hyphen (`-`). For example, `docker-ce-3:{{% param "docker_ce_version" %}}-1.fc41`.
130130

131131
Replace `<VERSION_STRING>` with the desired version and then run the following
132132
command to install:

‎content/manuals/engine/install/raspberry-pi-os.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,15 +143,15 @@ Docker from the repository.
143143
# List the available versions:
144144
$ apt-cache madison docker-ce | awk '{ print $3 }'
145145

146-
5:27.4.0-1~raspbian.12~bookworm
147-
5:27.3.1-1~raspbian.12~bookworm
146+
5:{{% param "docker_ce_version" %}}-1~raspbian.12~bookworm
147+
5:{{% param "docker_ce_version_prev" %}}-1~raspbian.12~bookworm
148148
...
149149
```
150150

151151
Select the desired version and install:
152152

153153
```console
154-
$ VERSION_STRING=5:27.4.0-1~raspbian.12~bookworm
154+
$ VERSION_STRING=5:{{% param "docker_ce_version" %}}-1~raspbian.12~bookworm
155155
$ sudo apt-get install docker-ce=$VERSION_STRING docker-ce-cli=$VERSION_STRING containerd.io docker-buildx-plugin docker-compose-plugin
156156
```
157157

‎content/manuals/engine/install/rhel.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ $ sudo dnf config-manager --add-repo {{% param "download-url-base" %}}/docker-ce
119119
```console
120120
$ dnf list docker-ce --showduplicates | sort -r
121121

122-
docker-ce.x86_64 3:27.4.0-1.el9 docker-ce-stable
123-
docker-ce.x86_64 3:27.3.1-1.el9 docker-ce-stable
122+
docker-ce.x86_64 3:{{% param "docker_ce_version" %}}-1.el9 docker-ce-stable
123+
docker-ce.x86_64 3:{{% param "docker_ce_version_prev" %}}-1.el9 docker-ce-stable
124124
<...>
125125
```
126126

@@ -129,7 +129,7 @@ $ sudo dnf config-manager --add-repo {{% param "download-url-base" %}}/docker-ce
129129

130130
Install a specific version by its fully qualified package name, which is
131131
the package name (`docker-ce`) plus the version string (2nd column),
132-
separated by a hyphen (`-`). For example, `docker-ce-3:27.4.0-1.el9`.
132+
separated by a hyphen (`-`). For example, `docker-ce-3:{{% param "docker_ce_version" %}}-1.el9`.
133133

134134
Replace `<VERSION_STRING>` with the desired version and then run the following
135135
command to install:

‎content/manuals/engine/install/sles.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,16 +140,16 @@ $ sudo zypper addrepo {{% param "download-url-base" %}}/docker-ce.repo
140140
```console
141141
$ sudo zypper search -s --match-exact docker-ce | sort -r
142142
143-
v | docker-ce | package | 3:27.4.0-1 | s390x | Docker CE Stable - s390x
144-
v | docker-ce | package | 3:27.3.1-1 | s390x | Docker CE Stable - s390x
143+
v | docker-ce | package | 3:{{% param "docker_ce_version" %}}-1 | s390x | Docker CE Stable - s390x
144+
v | docker-ce | package | 3:{{% param "docker_ce_version_prev" %}}-1 | s390x | Docker CE Stable - s390x
145145
```
146146

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

150150
Install a specific version by its fully qualified package name, which is
151151
the package name (`docker-ce`) plus the version string (2nd column),
152-
separated by a hyphen (`-`). For example, `docker-ce-3:27.4.0`.
152+
separated by a hyphen (`-`). For example, `docker-ce-3:{{% param "docker_ce_version" %}}`.
153153

154154
Replace `<VERSION_STRING>` with the desired version and then run the following
155155
command to install:

‎content/manuals/engine/install/ubuntu.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,15 +158,15 @@ Docker from the repository.
158158
# List the available versions:
159159
$ apt-cache madison docker-ce | awk '{ print $3 }'
160160

161-
5:27.4.0-1~ubuntu.24.04~noble
162-
5:27.3.1-1~ubuntu.24.04~noble
161+
5:{{% param "docker_ce_version" %}}-1~ubuntu.24.04~noble
162+
5:{{% param "docker_ce_version_prev" %}}-1~ubuntu.24.04~noble
163163
...
164164
```
165165

166166
Select the desired version and install:
167167

168168
```console
169-
$ VERSION_STRING=5:27.4.0-1~ubuntu.24.04~noble
169+
$ VERSION_STRING=5:{{% param "docker_ce_version" %}}-1~ubuntu.24.04~noble
170170
$ sudo apt-get install docker-ce=$VERSION_STRING docker-ce-cli=$VERSION_STRING containerd.io docker-buildx-plugin docker-compose-plugin
171171
```
172172

‎content/manuals/security/for-admins/access-tokens.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,15 @@ The organization access tokens feature is currently in [Beta](../../release-life
1212

1313
> [!WARNING]
1414
>
15-
> Organization access tokens aren't currently compatible with the following services:
15+
> Organization access tokens (OATs) are not intended to be used with Docker Desktop, and are incompatible.
16+
>
17+
> OATs are also currently incompatible with the following services:
1618
>
1719
> - Docker Build Cloud
1820
> - Docker Scout
1921
> - Docker REST APIs
2022
>
21-
> If you use these services, you must use personal access tokens instead.
23+
> If you use Docker Desktop or one of these services, you must use personal access tokens instead.
2224
2325
An organization access token (OAT) is like a [personal access token
2426
(PAT)](/security/for-developers/access-tokens/), but an OAT is associated with

‎hugo.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ params:
108108

109109
latest_engine_api_version: "1.47"
110110
docker_ce_version: "27.4.0"
111+
docker_ce_version_prev: "27.3.1"
111112
compose_version: "v2.30.3"
112113
compose_file_v3: "3.8"
113114
compose_file_v2: "2.4"

0 commit comments

Comments
 (0)