From 894316452254aa95a3506df7ca135b3cf1043788 Mon Sep 17 00:00:00 2001
From: Froz <taidao90@gmail.com>
Date: Sun, 16 Oct 2022 16:38:58 -0700
Subject: [PATCH] Updated docker scripts for docker compose v2

---
 initial ubuntu setup/part-2-docker-scripts.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/initial ubuntu setup/part-2-docker-scripts.sh b/initial ubuntu setup/part-2-docker-scripts.sh
index 10a640e..ffcb863 100644
--- a/initial ubuntu setup/part-2-docker-scripts.sh	
+++ b/initial ubuntu setup/part-2-docker-scripts.sh	
@@ -10,13 +10,16 @@ USERNAME=yourusername
 
 apt update
 apt install apt-transport-https ca-certificates curl software-properties-common
-curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu focal stable"
+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
 apt update
 apt-cache policy docker-ce
 apt install docker-ce
 systemctl status docker
 usermod -aG docker ${USERNAME}
 
-curl -L "https://github.com/docker/compose/releases/download/1.27.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
-chmod +x /usr/local/bin/docker-compose
+# Install Docker-Compose
+mkdir -p ~/.docker/cli-plugins/
+curl -SL "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-$(uname -s)-$(uname -m)" -o ~/.docker/cli-plugins/docker-compose
+chmod +x ~/.docker/cli-plugins/docker-compose
+docker compose version
\ No newline at end of file