From 33befd692249d11ce7bc88052d82709a07a8107f Mon Sep 17 00:00:00 2001 From: audunmg Date: Fri, 19 Jan 2024 09:08:04 +0900 Subject: [PATCH] Fix apt-get ascii GPG key Changing the file extension for the GPG key to .asc lets apt-get know the GPG key is in ascii armor format, no need to dearmor. Co-authored-by: audunmg Co-authored-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- content/engine/install/debian.md | 5 ++--- content/engine/install/raspberry-pi-os.md | 5 ++--- content/engine/install/ubuntu.md | 7 +++---- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/content/engine/install/debian.md b/content/engine/install/debian.md index 2fc2ae482a64..400774f5fb14 100644 --- a/content/engine/install/debian.md +++ b/content/engine/install/debian.md @@ -98,12 +98,11 @@ Docker from the repository. sudo apt-get update sudo apt-get install ca-certificates curl gnupg sudo install -m 0755 -d /etc/apt/keyrings - curl -fsSL {{% param "download-url-base" %}}/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg - sudo chmod a+r /etc/apt/keyrings/docker.gpg + curl -fsSL {{% param "download-url-base" %}}/gpg -O /etc/apt/keyrings/docker.asc # Add the repository to Apt sources: echo \ - "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] {{% param "download-url-base" %}} \ + "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 apt-get update diff --git a/content/engine/install/raspberry-pi-os.md b/content/engine/install/raspberry-pi-os.md index 0cdccfd44c99..506bc881959d 100644 --- a/content/engine/install/raspberry-pi-os.md +++ b/content/engine/install/raspberry-pi-os.md @@ -100,12 +100,11 @@ Docker from the repository. sudo apt-get update sudo apt-get install ca-certificates curl gnupg sudo install -m 0755 -d /etc/apt/keyrings - curl -fsSL {{% param "download-url-base" %}}/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg - sudo chmod a+r /etc/apt/keyrings/docker.gpg + curl -fsSL {{% param "download-url-base" %}}/gpg -O /etc/apt/keyrings/docker.asc # Set up Docker's APT repository: echo \ - "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] {{% param "download-url-base" %}} \ + "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 apt-get update diff --git a/content/engine/install/ubuntu.md b/content/engine/install/ubuntu.md index 465e8ed47437..eeb76378a4fa 100644 --- a/content/engine/install/ubuntu.md +++ b/content/engine/install/ubuntu.md @@ -109,12 +109,11 @@ Docker from the repository. sudo apt-get update sudo apt-get install ca-certificates curl gnupg sudo install -m 0755 -d /etc/apt/keyrings - curl -fsSL {{% param "download-url-base" %}}/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg - sudo chmod a+r /etc/apt/keyrings/docker.gpg - + curl -fsSL {{% param "download-url-base" %}}/gpg -O /etc/apt/keyrings/docker.asc + # Add the repository to Apt sources: echo \ - "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] {{% param "download-url-base" %}} \ + "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 apt-get update