From 31c44a82cabf6fef42a53413bdebaf041fb0a826 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20des=20Ligneris?= Date: Thu, 26 Sep 2024 22:01:46 -0400 Subject: [PATCH 1/4] Update debian.md The instructions do not work. I believe the file need to be in gpg format. Tested on a fresh debian 12 install withn only htop and nvim installed. --- content/manuals/engine/install/debian.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/manuals/engine/install/debian.md b/content/manuals/engine/install/debian.md index 47f635399a90..1b1441e35aab 100644 --- a/content/manuals/engine/install/debian.md +++ b/content/manuals/engine/install/debian.md @@ -110,8 +110,8 @@ Docker from the repository. sudo apt-get update sudo apt-get 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 curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor --yes -o /etc/apt/keyrings/docker.gpg + sudo chmod a+r /etc/apt/keyrings/docker.gpg # Add the repository to Apt sources: echo \ From 083caf00cfc68a25121cd13f1cd4542e0e44045c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20des=20Ligneris?= Date: Fri, 27 Sep 2024 08:04:59 -0400 Subject: [PATCH 2/4] Use a debian-based URL to get the docker key --- 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 1b1441e35aab..7690f9060cf1 100644 --- a/content/manuals/engine/install/debian.md +++ b/content/manuals/engine/install/debian.md @@ -110,7 +110,7 @@ Docker from the repository. sudo apt-get update sudo apt-get install ca-certificates curl sudo install -m 0755 -d /etc/apt/keyrings - sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor --yes -o /etc/apt/keyrings/docker.gpg + sudo curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor --yes -o /etc/apt/keyrings/docker.gpg sudo chmod a+r /etc/apt/keyrings/docker.gpg # Add the repository to Apt sources: From b98d5d8172b392c0b2f21d7694df1dc9a5010dc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20des=20Ligneris?= Date: Fri, 27 Sep 2024 19:40:06 -0400 Subject: [PATCH 3/4] put the key file iin /usr/share/keyrings/docker.gpg --- content/manuals/engine/install/debian.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/manuals/engine/install/debian.md b/content/manuals/engine/install/debian.md index 7690f9060cf1..b06f4824df36 100644 --- a/content/manuals/engine/install/debian.md +++ b/content/manuals/engine/install/debian.md @@ -110,12 +110,12 @@ Docker from the repository. sudo apt-get update sudo apt-get install ca-certificates curl sudo install -m 0755 -d /etc/apt/keyrings - sudo curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor --yes -o /etc/apt/keyrings/docker.gpg - sudo chmod a+r /etc/apt/keyrings/docker.gpg + sudo curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor --yes -o /usr/share/keyrings/docker.gpg + sudo chmod a+r /usr/share/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" %}} \ + "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker.gpg] {{% param "download-url-base" %}} \ $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \ sudo tee /etc/apt/sources.list.d/docker.list > /dev/null sudo apt-get update From e761e1d47334a94406ba2c967480f25cc43336f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20des=20Ligneris?= Date: Fri, 27 Sep 2024 19:40:57 -0400 Subject: [PATCH 4/4] no need to change the permission on /usr/share/keyrings --- content/manuals/engine/install/debian.md | 1 - 1 file changed, 1 deletion(-) diff --git a/content/manuals/engine/install/debian.md b/content/manuals/engine/install/debian.md index b06f4824df36..6fcf360686cd 100644 --- a/content/manuals/engine/install/debian.md +++ b/content/manuals/engine/install/debian.md @@ -109,7 +109,6 @@ Docker from the repository. # Add Docker's official GPG key: sudo apt-get update sudo apt-get install ca-certificates curl - sudo install -m 0755 -d /etc/apt/keyrings sudo curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor --yes -o /usr/share/keyrings/docker.gpg sudo chmod a+r /usr/share/keyrings/docker.gpg