From 058370b923a6b6af493e4d0a5d108f3f06a361e6 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sun, 3 Sep 2023 10:33:26 -0500
Subject: [PATCH] update

---
 defaults.inc      |  2 +-
 linupx-scripts.sh | 25 ++++++++++++++++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index 803df68..667b193 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -2,7 +2,7 @@
 
 action="$1"
 FOLDER='/opt/idssys/linupx'
-VERS='6.60.11-08292023'
+VERS='6.60.12-09032023'
 
 
 
diff --git a/linupx-scripts.sh b/linupx-scripts.sh
index 6dcc92b..c7a842a 100755
--- a/linupx-scripts.sh
+++ b/linupx-scripts.sh
@@ -564,6 +564,28 @@ DSMON_INSTALL() {
 		ENTER2CONTINUE
 	esac
 }
+DOCKER_INSTALL() {
+	read -n 1 -p "Are you sure you wish to install Docker (Y/n)?" choice
+	case "$choice" in 
+	[Nn]) INSTALL_MENU;;
+	* )
+		echo
+		
+		apt -y install ca-certificates curl gnupg
+		sudo install -m 0755 -d /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 \
+		  "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | \
+		  sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+		apt update
+		sudo apt -y install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
+		
+		echo
+		ENTER2CONTINUE
+	esac
+}
 TAILSCALE_INSTALL() {
 	echo
 	echo "This script currently only works with Ubuntu"
@@ -979,6 +1001,7 @@ INSTALL_MENU() {
 		echo -e "Domain:    ${idsCL[Cyan]}$(hostname -d)${idsCL[Default]}"
 		echo -e "${idsCL[LightGreen]}---------------------------------------------------------------------------${idsCL[Default]}"
 		echo -e "\n ${idsCL[LightGreen]}INSTALLATION SCRIPTS${idsCL[Default]}\n"
+		echo -e " [${idsCL[Yellow]}0${idsCL[Default]}] Install Docker"
 		echo -e " [${idsCL[Yellow]}1${idsCL[Default]}] Install Webmin"
 		echo -e " [${idsCL[Yellow]}2${idsCL[Default]}] Install Glances"
 		echo -e " [${idsCL[Yellow]}3${idsCL[Default]}] Install x11vnc"
@@ -1015,7 +1038,7 @@ INSTALL_MENU() {
 			7) IPERF_INSTALL; INSTALL_MENU;;
 			8) SPEEDTEST_INSTALL; INSTALL_MENU;;
 			9) BASHRC_INSTALL; INSTALL_MENU;;
-			0) LINUPX_UNINSTALL; INSTALL_MENU;;
+			0) DOCKER_INSTALL; INSTALL_MENU;;
 			[Uu]) URBACKUP_INSTALL; INSTALL_MENU;;
 			[Dd]) DSMON_INSTALL; INSTALL_MENU;;
 			[Pp]) POSTFIX_INSTALL; INSTALL_MENU;;