wip

install/docker

@@ -1,35 +1,39 @@
 #!/bin/bash
-##makedesc: Install docker (latest) + docker-compose (latest) + ppa
-source `dirname $0`/../helpers || exit 255
+##makedesc: Install docker (latest) + ppa
+source "$( dirname $(readlink -e -- "${BASH_SOURCE}"))/../helpers.sh" || exit 255
 
 # https://docs.docker.com/engine/install/ubuntu/
+# https://docs.docker.com/engine/install/linux-postinstall/#manage-docker-as-a-non-root-user
 
 title
 
-require ca-certificates
-require curl
-require gnupg
-require lsb-release
+for pkg in docker.io docker-doc docker-compose docker-compose-v2 podman-docker containerd runc; do
+    apt_remove $pkg
+done
 
-sudo mkdir -p /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 && \
-    echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
-    | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null && \
-    sudo apt update && \
-    sudo apt install -y --autoremove \
-        docker-ce \
-        docker-ce-cli \
-        containerd.io \
-        docker-compose-plugin && \
-    sudo usermod -aG docker $(whoami)
+require ca-certificates lsb-release
+source /etc/os-release
 
-[ $? = 0 ] && {
-    echo
-    success "Docker installed!"
-    info "Probably, you need to relogin to apply 'docker' group."
-    info "Your ones currently are: $(groups)"
-    docker --version
-    echo
-}
+key="/etc/apt/keyrings/docker.asc"
+
+sudo install -m 0755 -d /etc/apt/keyrings
+sudo cdownload https://download.docker.com/linux/ubuntu/gpg $key
+sudo chmod a+r $key
+
+echo "deb [arch=$(dpkg_arch) signed-by=$key] https://download.docker.com/linux/ubuntu $VERSION_CODENAME stable" \
+    | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+
+apt_update
+apt_install \
+    docker-ce \
+    docker-ce-cli \
+    containerd.io \
+    docker-buildx-plugin \
+    docker-compose-plugin
+
+sudo usermod -aG docker $(whoami)
+newgrp docker
+
+success "Docker installed!"
+docker --version
+info "Probably, you need to relogin to apply 'docker' group permanently."