Merge pull request #1096 from aslanvyos/patch-3

Update build-vyos.rst
vyos · Sep 25, 2023 · 7727775 · 7727775
2 parents f48d0ab + 84eacd2
commit 7727775
Showing 1 changed file with 15 additions and 13 deletions.
diff --git a/docs/contributing/build-vyos.rst b/docs/contributing/build-vyos.rst
@@ -50,19 +50,21 @@ Installing Docker_ and prerequisites:
 
 .. code-block:: bash
 
-    sudo apt-get update
-    sudo apt-get -y install \
-      ca-certificates \
-      curl \
-      gnupg \
-      lsb-release
-    curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
-    echo \
-      "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu \
-      $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
-    sudo apt-get update
-    sudo apt-get install docker-ce docker-ce-cli containerd.io
-
+  # Add Docker's official GPG key:
+  sudo apt-get update
+  sudo apt-get install ca-certificates curl gnupg
+  sudo install -m 0755 -d /etc/apt/keyrings
+  curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+  sudo chmod a+r /etc/apt/keyrings/docker.gpg
+
+  # Add the repository to Apt sources:
+  echo \
+    "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \
+    "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | \
+    sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+  sudo apt-get update
+  sudo apt-get install docker-ce docker-ce-cli containerd.io
+    
 
 `On Fedora`_