engine/install: refresh debian.md for compliance with Deb822

Deprecate sources.list and use .sources instead

For context Deb822 format was introduced in apt version 1.1 ten years ago
and with the recent releases there is now a modernize-sources subcommand
to encourage migration into .sources format.

sources.list(5) says of the Deb822 ".sources" format "It is intended to
make this format gradually the default format, deprecating the previously
described one-line-style format, as it is easier to create, extend and
modify for humans and machines alike..."

https://wiki.debian.org/DebianRepository/UseThirdParty

Note for clarity /etc/apt/keyrings as the Docker install guide suggest is
in fact the correct location for a keyring installed by the system
operator, so the guide gets it half-right already.

Also some minor cleanup of the installation workflow where appropriate,
prefer sequoia over gpg, and prefer curl over wget, as appears in the
above Wiki article. Contextual examples are updated with the latest stable
release strings. Package name lists are sorted with `LANG=C sort`.

Author: eshattow

content/manuals/engine/install/debian.md

@@ -58,9 +58,9 @@ before you install the official version of Docker Engine.
 
 The unofficial packages to uninstall are:
 
-- `docker.io`
 - `docker-compose`
 - `docker-doc`
+- `docker.io`
 - `podman-docker`
 
 Moreover, Docker Engine depends on `containerd` and `runc`. Docker Engine
@@ -71,7 +71,12 @@ conflicts with the versions bundled with Docker Engine.
 Run the following command to uninstall all conflicting packages:
 
 ```console
-$ for pkg in docker.io docker-doc docker-compose podman-docker containerd runc
+$ for pkg in containerd \
+docker-compose \
+docker-doc \
+docker.io \
+podman-docker \
+runc
 do sudo apt remove $pkg
 done
 ```
@@ -91,8 +96,8 @@ You can install Docker Engine in different ways, depending on your needs:
   [Docker Desktop for Linux](/manuals/desktop/setup/install/linux/_index.md). This is
   the easiest and quickest way to get started.
 
-- Set up and install Docker Engine from
-  [Docker's `apt` repository](#install-using-the-repository).
+- Set up and install Docker Engine from the
+  [Docker `apt` repository](#install-using-the-repository).
 
 - [Install it manually](#install-from-a-package) and manage upgrades manually.
 
@@ -101,43 +106,36 @@ You can install Docker Engine in different ways, depending on your needs:
 
 {{% include "engine-license.md" %}}
 
-### Install using the `apt` repository {#install-using-the-repository}
+### Install using the Docker `apt` repository {#install-using-the-repository}
 
 Before you install Docker Engine for the first time on a new host machine, you
 need to set up the Docker `apt` repository. Afterward, you can install and update
 Docker from the repository.
 
-1. Set up Docker's `apt` repository.
+1. Set up the Docker `apt` repository.
 
    ```console
-   # Add Docker's official GPG key:
-   $ sudo apt update
-   $ sudo apt install ca-certificates curl
-   $ sudo install -m 0755 -d /etc/apt/keyrings
-   $ sudo curl -fsSL {{% param "download-url-base" %}}/gpg -o /etc/apt/keyrings/docker.asc
-   $ sudo chmod a+r /etc/apt/keyrings/docker.asc
+   $ sudo apt install curl ca-certificates sq
+
+   $ curl {{% param "download-url-base" %}}/gpg | \
+   sudo sq packet dearmor --output /etc/apt/keyrings/docker.gpg
 
-   # Add the repository to Apt sources:
-   $ echo \
-   "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] {{% param "download-url-base" %}} \
-   $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
-   sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+   $ sudo tee /etc/apt/sources.list.d/docker.sources << EOF
+   Types: deb
+   URIs: {{% param "download-url-base" %}}
+   Suites: $(. /etc/os-release && echo "$VERSION_CODENAME")
+   Components: stable
+   Signed-By: /etc/apt/keyrings/docker.gpg
+   EOF
 
    $ sudo apt update
    ```
 
    > [!NOTE]
    >
-   > If you use a derivative distribution, such as Kali Linux,
-   > you may need to substitute the part of this command that's expected to
-   > print the version codename:
-   >
-   > ```console
-   > $(. /etc/os-release && echo "$VERSION_CODENAME")
-   > ```
-   >
-   > Replace this part with the codename of the corresponding Debian release,
-   > such as `bookworm`.
+   > If you use a derivative distribution then you may need to change
+   > `Suites:` to the corresponding suite name from
+   > [`{{% param "download-url-base" %}}/dists/`]({{% param "download-url-base" %}}/dists/).
 
 2. Install the Docker packages.
 
@@ -147,7 +145,11 @@ Docker from the repository.
    To install the latest version, run:
 
    ```console
-   $ sudo apt install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
+   $ sudo apt install containerd.io \
+   docker-buildx-plugin \
+   docker-ce \
+   docker-ce-cli \
+   docker-compose-plugin
    ```
 
    {{< /tab >}}
@@ -159,16 +161,19 @@ Docker from the repository.
    ```console
    $ apt list --all-versions docker-ce
 
-     docker-ce/bookworm 5:{{% param "docker_ce_version" %}}-1~debian.12~bookworm <arch>
-     docker-ce/bookworm 5:{{% param "docker_ce_version_prev" %}}-1~debian.12~bookworm <arch>
+     docker-ce/trixie 5:{{% param "docker_ce_version" %}}-1~debian.13~trixie <arch>
+     docker-ce/trixie 5:{{% param "docker_ce_version_prev" %}}-1~debian.13~trixie <arch>
      ...
    ```
 
    Select the desired version and install:
 
    ```console
-   $ VERSION_STRING=5:{{% param "docker_ce_version" %}}-1~debian.12~bookworm
-   $ sudo apt install docker-ce=$VERSION_STRING docker-ce-cli=$VERSION_STRING containerd.io docker-buildx-plugin docker-compose-plugin
+   $ sudo apt install containerd.io \
+   docker-buildx-plugin \
+   docker-ce=5:{{% param "docker_ce_version" %}}-1~debian.13~trixie \
+   docker-ce-cli=5:{{% param "docker_ce_version" %}}-1~debian.13~trixie \
+   docker-compose-plugin
    ```
 
    {{< /tab >}}
@@ -210,9 +215,8 @@ choosing the new version you want to install.
 
 ### Install from a package
 
-If you can't use Docker's `apt` repository to install Docker Engine, you can
-download the `deb` file for your release and install it manually. You need to
-download a new file each time you want to upgrade Docker Engine.
+You may download the `deb` file for your release and install it manually. You
+would need to download a new file each time you want to upgrade Docker Engine.
 
 <!-- markdownlint-disable-next-line -->
 1. Go to [`{{% param "download-url-base" %}}/dists/`]({{% param "download-url-base" %}}/dists/).
@@ -296,8 +300,8 @@ To upgrade Docker Engine, download the newer package files and repeat the
 3. Remove source list and keyrings
 
    ```console
-   $ sudo rm /etc/apt/sources.list.d/docker.list
-   $ sudo rm /etc/apt/keyrings/docker.asc
+   $ sudo rm /etc/apt/sources.list.d/docker.sources
+   $ sudo rm /etc/apt/keyrings/docker.gpg
    ```
 
 You have to delete any edited configuration files manually.