From 7ad91f1356fae9d0b3b494b78b6c2fb3f0b78eb8 Mon Sep 17 00:00:00 2001
From: David Karlsson <david.karlsson@docker.com>
Date: Sat, 8 Apr 2023 12:42:11 +0200
Subject: [PATCH 1/2] engine: replace mkdir with install for gpg setup

Signed-off-by: David Karlsson <david.karlsson@docker.com>
---
 engine/install/debian.md | 14 +-------------
 engine/install/ubuntu.md | 14 +-------------
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/engine/install/debian.md b/engine/install/debian.md
index 088b8d86ea0..d850c914cdf 100644
--- a/engine/install/debian.md
+++ b/engine/install/debian.md
@@ -95,7 +95,7 @@ Docker from the repository.
 2.  Add Docker's official GPG key:
 
     ```console
-    $ sudo mkdir -m 0755 -p /etc/apt/keyrings
+    $ sudo install -m 0755 -d /etc/apt/keyrings
     $ curl -fsSL {{ download-url-base }}/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
     ```
 
@@ -119,18 +119,6 @@ Raspbian.
    $ sudo apt-get update
    ```
 
-   > Receiving a GPG error when running `apt-get update`?
-   >
-   > Your default [umask](https://en.wikipedia.org/wiki/Umask){: target="blank"
-   > rel="noopener" } may be incorrectly configured, preventing detection of the
-   > repository public key file. Try granting read permission for the Docker
-   > public key file before updating the package index:
-   >
-   > ```console
-   > $ sudo chmod a+r /etc/apt/keyrings/docker.gpg
-   > $ sudo apt-get update
-   > ```
-
 2. Install Docker Engine, containerd, and Docker Compose.
 
    <ul class="nav nav-tabs">
diff --git a/engine/install/ubuntu.md b/engine/install/ubuntu.md
index 6a07e222ec9..857239a6c6d 100644
--- a/engine/install/ubuntu.md
+++ b/engine/install/ubuntu.md
@@ -94,7 +94,7 @@ Docker from the repository.
 2.  Add Docker's official GPG key:
 
     ```console
-    $ sudo mkdir -m 0755 -p /etc/apt/keyrings
+    $ sudo install -m 0755 -d /etc/apt/keyrings
     $ curl -fsSL {{ download-url-base }}/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
     ```
 
@@ -115,18 +115,6 @@ Docker from the repository.
    $ sudo apt-get update
    ```
 
-   > Receiving a GPG error when running `apt-get update`?
-   >
-   > Your default [umask](https://en.wikipedia.org/wiki/Umask){: target="blank"
-   > rel="noopener" } may be incorrectly configured, preventing detection of the
-   > repository public key file. Try granting read permission for the Docker
-   > public key file before updating the package index:
-   >
-   > ```console
-   > $ sudo chmod -R a+rx /etc/apt/keyrings
-   > $ sudo apt-get update
-   > ```
-
 2. Install Docker Engine, containerd, and Docker Compose.
 
    <ul class="nav nav-tabs">

From d421693c9f86a92583923d8be6179cfda3483b45 Mon Sep 17 00:00:00 2001
From: David Karlsson <david.karlsson@docker.com>
Date: Sat, 8 Apr 2023 18:34:56 +0200
Subject: [PATCH 2/2] engine: add chmod a+r for docker.gpg key

Signed-off-by: David Karlsson <david.karlsson@docker.com>
---
 engine/install/debian.md | 1 +
 engine/install/ubuntu.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/engine/install/debian.md b/engine/install/debian.md
index d850c914cdf..34e9be26951 100644
--- a/engine/install/debian.md
+++ b/engine/install/debian.md
@@ -97,6 +97,7 @@ Docker from the repository.
     ```console
     $ sudo install -m 0755 -d /etc/apt/keyrings
     $ curl -fsSL {{ download-url-base }}/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+    $ sudo chmod a+r /etc/apt/keyrings/docker.gpg
     ```
 
 3.  Use the following command to set up the repository:
diff --git a/engine/install/ubuntu.md b/engine/install/ubuntu.md
index 857239a6c6d..dbe2a4add61 100644
--- a/engine/install/ubuntu.md
+++ b/engine/install/ubuntu.md
@@ -96,6 +96,7 @@ Docker from the repository.
     ```console
     $ sudo install -m 0755 -d /etc/apt/keyrings
     $ curl -fsSL {{ download-url-base }}/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+    $ sudo chmod a+r /etc/apt/keyrings/docker.gpg
     ```
 
 3.  Use the following command to set up the repository: