From e58c174fa21b1b804fe867017d747fa0eca4a9c8 Mon Sep 17 00:00:00 2001
From: M0VUB <76499782+ShaYmez@users.noreply.github.com>
Date: Thu, 3 Feb 2022 13:20:00 +0000
Subject: [PATCH] Update hblink3-docker-install.sh

Update docker repo for apt-get
---
 hblink3-docker-install.sh | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/hblink3-docker-install.sh b/hblink3-docker-install.sh
index dc0a4a3..b97bcf5 100755
--- a/hblink3-docker-install.sh
+++ b/hblink3-docker-install.sh
@@ -57,8 +57,8 @@ INSDIR=/opt/tmp/
 HBLINKTMP=/opt/tmp/hblink3
 HBMONDIR=/opt/HBMonv2/
 HBDIR=/etc/hblink3/
-DEP="wget curl git python3 python3-dev python3-pip libffi-dev libssl-dev conntrack sed cargo apache2 php snapd figlet"
-DEP1="wget curl git python3 python3-dev python3-pip libffi-dev libssl-dev conntrack sed cargo apache2 php snapd figlet"
+DEP="wget curl git python3 python3-dev python3-pip libffi-dev libssl-dev conntrack sed cargo apache2 php snapd figlet ca-certificates gnupg lsb-release"
+DEP1="wget curl git python3 python3-dev python3-pip libffi-dev libssl-dev conntrack sed cargo apache2 php snapd figlet ca-certificates gnupg lsb-release"
 HBGITREPO=https://github.com/ShaYmez/hblink3.git
 HBGITMONREPO=https://github.com/ShaYmez/HBMonv2.git
 echo ""
@@ -68,24 +68,42 @@ echo "--------------------------------------------------------------------------
 
         if [ $VERSION = 10 ];
         then
+                apt-get update
                 apt-get install -y $DEP
                 sleep 2
-                figlet "docker.io"
-                curl -sSL https://get.docker.com | sh
+                apt-get remove docker docker-engine docker.io containerd runc
+                curl -fsSL https://download.docker.com/linux/debian/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/debian \
+                $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+                
+                apt-get update
+                apt-get install docker-ce docker-ce-cli containerd.io
                 apt-get install -y docker-compose
                 systemctl enable docker
                 systemctl start docker
+                figlet "docker.ce"
                 echo Set userland-proxy to false...
                 echo '{ "userland-proxy": false}' > /etc/docker/daemon.json
         elif [ $VERSION = 11 ];
         then
-                apt-get install -y $DEP1
+                apt-get update
+                apt-get install -y $DEP
                 sleep 2
-                figlet "docker.io"
-                curl -sSL https://get.docker.com | sh
+                apt-get remove docker docker-engine docker.io containerd runc
+                curl -fsSL https://download.docker.com/linux/debian/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/debian \
+                $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+                
+                apt-get update
+                apt-get install docker-ce docker-ce-cli containerd.io
                 apt-get install -y docker-compose
                 systemctl enable docker
                 systemctl start docker
+                figlet "docker.ce"
                 echo Set userland-proxy to false...
                 echo '{ "userland-proxy": false}' > /etc/docker/daemon.json
         else