From 92836acb647636fbd62c8c0c577148fcfc97ec6e Mon Sep 17 00:00:00 2001
From: Ihar Hancharenka <ihar.hancharenka@inspirebrands.com>
Date: Mon, 10 Feb 2025 21:08:31 +0300
Subject: [PATCH] m

---
 devops/container/docker/inst/ubuntu.txt | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/devops/container/docker/inst/ubuntu.txt b/devops/container/docker/inst/ubuntu.txt
index e75d0bd2c..caac2c3f6 100644
--- a/devops/container/docker/inst/ubuntu.txt
+++ b/devops/container/docker/inst/ubuntu.txt
@@ -2,16 +2,27 @@ https://docs.docker.com/engine/install/ubuntu/
 20.x - focal
 https://download.docker.com/linux/ubuntu/dists/focal/
 
-sudo apt remove docker docker-engine docker.io containerd runc
-sudo apt install apt-transport-https 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=amd64 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
+for pkg in docker.io docker-doc docker-compose docker-compose-v2 podman-docker containerd runc; do sudo apt-get remove $pkg; done
+
+# Add Docker's official GPG key:
 sudo apt update
-sudo apt install docker-ce docker-ce-cli containerd.io
+sudo apt install ca-certificates curl
+sudo install -m 0755 -d /etc/apt/keyrings
+sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
+sudo chmod a+r /etc/apt/keyrings/docker.asc
+# Add the repository to Apt sources:
+echo \
+  "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \
+  $(. /etc/os-release && echo "${UBUNTU_CODENAME:-$VERSION_CODENAME}") stable" | \
+  sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+sudo apt update
+sudo apt install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
+
 
 ...
-https://docs.docker.com/engine/install/linux-postinstall
+https://docs.docker.com/engine/install/linux-postinstall/
     sudo groupadd docker
+    sudo usermod -aG docker $USER
 ...
 sudo systemctl edit docker.service
     ! using nano editor, not a vim