Skip to content
Open
Changes from 2 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
12 changes: 11 additions & 1 deletion content/manuals/engine/install/debian.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,21 @@ Docker from the repository.
sudo curl -fsSL {{% param "download-url-base" %}}/gpg -o /etc/apt/keyrings/docker.asc
sudo chmod a+r /etc/apt/keyrings/docker.asc

# Add the repository to Apt sources:
# Add the repository to Apt sources (legacy format):
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

# Add the repository to Apt sources (new deb822 format, introduced with Trixie):

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

deb822 format was introduced in apt version 1.1 ten years before the release of Trixie

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh 😅 , thanks for that comment.
Did not know that, I can adjust the comment together with possible other review comments.

Maybe we should just say:

 # Add the repository to Apt sources (deb822 format)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Drop this comment and the use of non-deb822 format sources

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addressed with 7e2650e

(Hope it is still ok to keep the original comment, which just stated # Add the repository to Apt sources:. The paragraph seemed to me a bit lonely without the comment. At least explanations about (non-)deb822 are gone now).

echo -e \
"Types: deb\n\
URIs: https://download.docker.com/linux/debian/\n\
Suites: $(. /etc/os-release && echo "$VERSION_CODENAME")\n\
Components: stable\n\
Signed-By: /etc/apt/keyrings/docker.gpg" | \
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Signed-By: /etc/apt/keyrings/docker.gpg" | \
Signed-By: /etc/apt/keyrings/docker.asc" | \

Just a typo correction

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wrong way around. This should be a machine-readable file not ASCII export.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All right, then .gpg should be fine. Kept that in the newest commit 7e2650e

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@LLdaniel @eshattow, the fact is, if you download an ASCII armored key, you have to dearmor it before using the binary version of the key.

So either you have to use the docker.asc (armored ASCII version), or you have to dearmor it first to get the binary docker.gpg version of the key!

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for clarifying! Now I switched back to the originally used .asc.
But if you prefer gpg --dearmor I can also include that. Just let me know. 👍

sudo tee /etc/apt/sources.list.d/docker.sources > /dev/null

sudo apt-get update
```

Expand Down