From 7ecb568cb2bdc3486329ad01329c0eb41cc6f4f4 Mon Sep 17 00:00:00 2001 From: LLdaniel Date: Fri, 15 Aug 2025 10:11:05 +0200 Subject: [PATCH 1/4] add deb822 apt sources to install section in Debian --- content/manuals/engine/install/debian.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/content/manuals/engine/install/debian.md b/content/manuals/engine/install/debian.md index 0ca59c2490a8..a9710d2e01f6 100644 --- a/content/manuals/engine/install/debian.md +++ b/content/manuals/engine/install/debian.md @@ -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): + 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" | \ + sudo tee /etc/apt/sources.list.d/docker.sources > /dev/null + sudo apt-get update ``` From 3876ed7f02afec89987dba5a048afe3ba62f57c9 Mon Sep 17 00:00:00 2001 From: LLdaniel Date: Fri, 15 Aug 2025 10:35:30 +0200 Subject: [PATCH 2/4] remove whitespaces in final sources file --- content/manuals/engine/install/debian.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/content/manuals/engine/install/debian.md b/content/manuals/engine/install/debian.md index a9710d2e01f6..1b4f63bee71a 100644 --- a/content/manuals/engine/install/debian.md +++ b/content/manuals/engine/install/debian.md @@ -122,12 +122,12 @@ Docker from the repository. # Add the repository to Apt sources (new deb822 format, introduced with Trixie): 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" | \ - sudo tee /etc/apt/sources.list.d/docker.sources > /dev/null + "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" | \ + sudo tee /etc/apt/sources.list.d/docker.sources > /dev/null sudo apt-get update ``` From 7e2650eb493e67c2fdddef42546bb71f265eb8ae Mon Sep 17 00:00:00 2001 From: LLdaniel Date: Mon, 22 Sep 2025 11:48:45 +0200 Subject: [PATCH 3/4] remove non-deb822 format sources --- content/manuals/engine/install/debian.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/content/manuals/engine/install/debian.md b/content/manuals/engine/install/debian.md index 1b4f63bee71a..b7e34629541f 100644 --- a/content/manuals/engine/install/debian.md +++ b/content/manuals/engine/install/debian.md @@ -114,13 +114,7 @@ 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 (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): + # Add the repository to Apt sources: echo -e \ "Types: deb\n\ URIs: https://download.docker.com/linux/debian/\n\ From 2bc7ca94e21c6ef7b47d308617d63b38f4f631d7 Mon Sep 17 00:00:00 2001 From: LLdaniel Date: Thu, 25 Sep 2025 21:47:04 +0200 Subject: [PATCH 4/4] use armored ascii key instead of .gpg --- content/manuals/engine/install/debian.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/manuals/engine/install/debian.md b/content/manuals/engine/install/debian.md index b7e34629541f..4a98f7580b8e 100644 --- a/content/manuals/engine/install/debian.md +++ b/content/manuals/engine/install/debian.md @@ -120,7 +120,7 @@ Docker from the repository. 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" | \ + Signed-By: /etc/apt/keyrings/docker.asc" | \ sudo tee /etc/apt/sources.list.d/docker.sources > /dev/null sudo apt-get update