Skip to content

publish updates from main #21609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 11, 2024
Merged

publish updates from main #21609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a1a44f4
engine: dynamic docker-ce version n (latest) and n-1
dvdksn Dec 10, 2024
150b1f7
Update callout in OATs docs (#21608)
sarahsanders-docker Dec 10, 2024
42251a1
Remove callout for service accounts (#21607)
sarahsanders-docker Dec 10, 2024
ccf45cd
Merge pull request #21599 from dvdksn/docker-ce-dynamic-example-versions
dvdksn Dec 11, 2024
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
4 changes: 0 additions & 4 deletions content/manuals/docker-hub/service-accounts.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@ weight: 50

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.

> [!NOTE]
>
> 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.

## Enhanced Service Account add-on tiers

Refer to the following table for details on the Enhanced Service Account add-ons:
Expand Down
6 changes: 3 additions & 3 deletions content/manuals/engine/install/centos.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ $ sudo dnf config-manager --add-repo {{% param "download-url-base" %}}/docker-ce
```console
$ dnf list docker-ce --showduplicates | sort -r

docker-ce.x86_64 3:27.4.0-1.el9 docker-ce-stable
docker-ce.x86_64 3:27.3.1-1.el9 docker-ce-stable
docker-ce.x86_64 3:{{% param "docker_ce_version" %}}-1.el9 docker-ce-stable
docker-ce.x86_64 3:{{% param "docker_ce_version_prev" %}}-1.el9 docker-ce-stable
<...>
```

Expand All @@ -129,7 +129,7 @@ $ sudo dnf 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.4.0-1.el9`.
separated by a hyphen (`-`). For example, `docker-ce-3:{{% param "docker_ce_version" %}}-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
View file
Open in desktop
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.4.0-1~debian.12~bookworm
5:27.3.1-1~debian.12~bookworm
5:{{% param "docker_ce_version" %}}-1~debian.12~bookworm
5:{{% param "docker_ce_version_prev" %}}-1~debian.12~bookworm
...
```

Select the desired version and install:

```console
$ VERSION_STRING=5:27.4.0-1~debian.12~bookworm
$ VERSION_STRING=5:{{% param "docker_ce_version" %}}-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
6 changes: 3 additions & 3 deletions content/manuals/engine/install/fedora.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,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.4.0-1.fc41 docker-ce-stable
docker-ce.x86_64 3:27.3.1-1.fc41 docker-ce-stable
docker-ce.x86_64 3:{{% param "docker_ce_version" %}}-1.fc41 docker-ce-stable
docker-ce.x86_64 3:{{% param "docker_ce_version_prev" %}}-1.fc41 docker-ce-stable
<...>
```

Expand All @@ -126,7 +126,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.4.0-1.fc41`.
separated by a hyphen (`-`). For example, `docker-ce-3:{{% param "docker_ce_version" %}}-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
View file
Open in desktop
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.4.0-1~raspbian.12~bookworm
5:27.3.1-1~raspbian.12~bookworm
5:{{% param "docker_ce_version" %}}-1~raspbian.12~bookworm
5:{{% param "docker_ce_version_prev" %}}-1~raspbian.12~bookworm
...
```

Select the desired version and install:

```console
$ VERSION_STRING=5:27.4.0-1~raspbian.12~bookworm
$ VERSION_STRING=5:{{% param "docker_ce_version" %}}-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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ $ sudo dnf config-manager --add-repo {{% param "download-url-base" %}}/docker-ce
```console
$ dnf list docker-ce --showduplicates | sort -r

docker-ce.x86_64 3:27.4.0-1.el9 docker-ce-stable
docker-ce.x86_64 3:27.3.1-1.el9 docker-ce-stable
docker-ce.x86_64 3:{{% param "docker_ce_version" %}}-1.el9 docker-ce-stable
docker-ce.x86_64 3:{{% param "docker_ce_version_prev" %}}-1.el9 docker-ce-stable
<...>
```

Expand All @@ -129,7 +129,7 @@ $ sudo dnf 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.4.0-1.el9`.
separated by a hyphen (`-`). For example, `docker-ce-3:{{% param "docker_ce_version" %}}-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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,16 +140,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.4.0-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:{{% param "docker_ce_version" %}}-1 | s390x | Docker CE Stable - s390x
v | docker-ce | package | 3:{{% param "docker_ce_version_prev" %}}-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.4.0`.
separated by a hyphen (`-`). For example, `docker-ce-3:{{% param "docker_ce_version" %}}`.

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/ubuntu.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,15 +158,15 @@ Docker from the repository.
# List the available versions:
$ apt-cache madison docker-ce | awk '{ print $3 }'

5:27.4.0-1~ubuntu.24.04~noble
5:27.3.1-1~ubuntu.24.04~noble
5:{{% param "docker_ce_version" %}}-1~ubuntu.24.04~noble
5:{{% param "docker_ce_version_prev" %}}-1~ubuntu.24.04~noble
...
```

Select the desired version and install:

```console
$ VERSION_STRING=5:27.4.0-1~ubuntu.24.04~noble
$ VERSION_STRING=5:{{% param "docker_ce_version" %}}-1~ubuntu.24.04~noble
$ 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: 4 additions & 2 deletions content/manuals/security/for-admins/access-tokens.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,15 @@ The organization access tokens feature is currently in [Beta](../../release-life

> [!WARNING]
>
> Organization access tokens aren't currently compatible with the following services:
> Organization access tokens (OATs) are not intended to be used with Docker Desktop, and are incompatible.
>
> OATs are also currently incompatible with the following services:
>
> - Docker Build Cloud
> - Docker Scout
> - Docker REST APIs
>
> If you use these services, you must use personal access tokens instead.
> If you use Docker Desktop or one of these services, you must use personal access tokens instead.

An organization access token (OAT) is like a [personal access token
(PAT)](/security/for-developers/access-tokens/), but an OAT is associated with
Expand Down
1 change: 1 addition & 0 deletions hugo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ params:

latest_engine_api_version: "1.47"
docker_ce_version: "27.4.0"
docker_ce_version_prev: "27.3.1"
compose_version: "v2.30.3"
compose_file_v3: "3.8"
compose_file_v2: "2.4"
Expand Down
Loading