From 5367cae534d135b5763983f3bb28f6297c6ea2d9 Mon Sep 17 00:00:00 2001
From: Guido Longoni <guido.longoni@briq.it>
Date: Mon, 8 Apr 2024 16:58:38 +0200
Subject: [PATCH] aggiornamenti secondo le ultime specifiche

---
 featlib/docker.sh  | 8 ++++----
 featlib/pip.sh     | 4 +++-
 featlib/rustup.sh  | 2 +-
 node_pip_docker.sh | 2 ++
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/featlib/docker.sh b/featlib/docker.sh
index 4e584d3..fb15fc3 100755
--- a/featlib/docker.sh
+++ b/featlib/docker.sh
@@ -3,7 +3,7 @@
 
 function feat_addpacks_docker() {
 	if ! feat_missing "apt-get"; then
-		sudo apt-get remove docker docker-engine docker.io containerd runc
+		for pkg in docker.io docker-doc docker-compose podman-docker containerd runc; do sudo apt-get remove $pkg; done
 		sudo apt-get update
 		if [ "$(apt-cache search docker-ce | grep -o "^docker-ce ")" != "docker-ce" ]; then
 			sudo apt-get install \
@@ -30,12 +30,12 @@ function feat_addpacks_docker() {
     			sudo mkdir -p /etc/apt/keyrings
                 curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
 			    echo \
-                "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian \
-                $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+                "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian \
+                $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
             fi			
             sudo apt-get update
 		fi
-		sudo apt-get install -y docker-ce docker-ce-cli containerd.io
+		sudo apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
 	fi
 }
 
diff --git a/featlib/pip.sh b/featlib/pip.sh
index 2f9f089..49a7e07 100755
--- a/featlib/pip.sh
+++ b/featlib/pip.sh
@@ -72,5 +72,7 @@ function pip_feat_add_docker-compose() {
 	. "$(this_script_path)/pip.sh"
 	. "$(this_script_path)/docker.sh"
     feat_needed "docker"
-	pip_feat_add "docker-compose"
+    # Ora docker compose è integrato dentro docker
+    # TODO: verificare compatibilità con comando docker-compose
+	#pip_feat_add "docker-compose"
 }
diff --git a/featlib/rustup.sh b/featlib/rustup.sh
index 2314f44..4427a81 100755
--- a/featlib/rustup.sh
+++ b/featlib/rustup.sh
@@ -5,7 +5,7 @@
 
 function feat_add_rustup() {
     feat_needed "curl"
-	curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+	curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal
     . "$HOME/.cargo/env"
 }
 
diff --git a/node_pip_docker.sh b/node_pip_docker.sh
index 706d602..7abb834 100755
--- a/node_pip_docker.sh
+++ b/node_pip_docker.sh
@@ -3,10 +3,12 @@
 . "grezzo.sh"
 . "featlib/npm.sh"
 . "featlib/pip.sh"
+. "featlib/rustup.sh"
 
 npm-g_feat_needed "npm-check-updates"
 npm-g_feat_needed "node-red"
 pip_feat_needed "docker-compose"
+#feat_needed "rustup"
 
 # mkdir -p test
 # cd test