From 5b1b9cc44e8ef630472172212c0d4766e0ffde1c Mon Sep 17 00:00:00 2001
From: sofukong <130022807+sofukong@users.noreply.github.com>
Date: Sat, 23 Dec 2023 02:26:18 +0800
Subject: build: update outdated entries

Adjusted the Debian version required for container construction and the
installation commands for the new version of Docker.
---
 docs/contributing/build-vyos.rst | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/docs/contributing/build-vyos.rst b/docs/contributing/build-vyos.rst
index ee23ff22..e873a3c4 100644
--- a/docs/contributing/build-vyos.rst
+++ b/docs/contributing/build-vyos.rst
@@ -27,7 +27,8 @@ also set up your own build machine and run a :ref:`build_native`.
    this page no longer includes content related to VyOS 1.4 and above.
 
 This will guide you though the process of building a VyOS ISO using Docker_.
-This process has been tested on clean installs of Debian Jessie and Buster.
+This process has been tested on clean installs of Debian Bullseye (11) and 
+Bookworm (12).
 
 .. _build_docker:
 
@@ -43,12 +44,21 @@ Installing Docker_ and prerequisites:
 
 .. code-block:: bash
 
+  # Add Docker's official GPG key:
   sudo apt-get update
-  sudo apt-get install -y apt-transport-https ca-certificates curl gnupg2 software-properties-common
-  curl -fsSL https://download.docker.com/linux/debian/gpg | sudo apt-key add -
-  sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/debian $(lsb_release -cs) stable"
+  sudo apt-get install ca-certificates curl gnupg
+  sudo install -m 0755 -d /etc/apt/keyrings
+  curl -fsSL https://download.docker.com/linux/debian/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/debian \
+    $(. /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 -y docker-ce
+  sudo apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
 
 `On Ubuntu`_
 
-- 
cgit v1.2.3