From 8911fe620833142b6a0a898152de6b8dff9421f1 Mon Sep 17 00:00:00 2001
From: Guido Longoni <guido.longoni@briq.it>
Date: Fri, 12 Nov 2021 12:49:09 +0100
Subject: [PATCH] Fixato docker, rinominato script di test che tanto lo usiamo
 sempre

---
 featlib/docker.sh  | 15 +++++++--------
 node_pip_docker.sh | 16 ++++++++++++++++
 test.sh            | 12 ------------
 3 files changed, 23 insertions(+), 20 deletions(-)
 create mode 100755 node_pip_docker.sh
 delete mode 100755 test.sh

diff --git a/featlib/docker.sh b/featlib/docker.sh
index 2aa965b..e2bcfc7 100755
--- a/featlib/docker.sh
+++ b/featlib/docker.sh
@@ -7,16 +7,15 @@ function feat_addpacks_docker() {
 		sudo apt-get update
 		if [ "$(apt-cache search docker-ce | grep -o "^docker-ce ")" != "docker-ce" ]; then
 			sudo apt-get install \
-				apt-transport-https \
 				ca-certificates \
 				curl \
-				gnupg-agent \
-				software-properties-common
-			curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-			sudo add-apt-repository \
-			"deb [arch=$(dpkg --print-architecture)] https://download.docker.com/linux/ubuntu \
-			$(lsb_release -cs) \
-			stable"
+				gnupg \
+				lsb-release
+			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
 			sudo apt-get update
 		fi
 		sudo apt-get install docker-ce docker-ce-cli containerd.io
diff --git a/node_pip_docker.sh b/node_pip_docker.sh
new file mode 100755
index 0000000..a52d747
--- /dev/null
+++ b/node_pip_docker.sh
@@ -0,0 +1,16 @@
+#! /bin/bash --
+
+. "grezzo.sh"
+. "featlib/npm.sh"
+. "featlib/pip.sh"
+. "featlib/docker.sh"
+
+npm-g_feat_needed "node-red"
+feat_needed "docker"
+pip_feat_needed "docker-compose"
+
+# mkdir -p test
+# cd test
+# poetry_feat_needed "django"
+# poetry_feat_needed "numpy"
+
diff --git a/test.sh b/test.sh
deleted file mode 100755
index bddc9b4..0000000
--- a/test.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/bash --
-
-. "grezzo.sh"
-. "featlib/poetry.sh"
-. "featlib/npm.sh"
-
-npm-g_feat_needed "node-red"
-
-mkdir -p test
-cd test
-poetry_feat_needed "django"
-poetry_feat_needed "numpy"