maj docker

install.sh

@@ -28,36 +28,33 @@ echo "\n
 ██║   ██║██╔═══╝ ██║   ██║██╔══██╗██╔══██║██║  ██║██╔══╝  
 ╚██████╔╝██║     ╚██████╔╝██║  ██║██║  ██║██████╔╝███████╗
  ╚═════╝ ╚═╝      ╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═╝╚═════╝ ╚══════╝"
-sudo apt-get install git wget curl net-tools nmap htop python3-pip zip openssh-server gimp wireguard -y
+sudo apt-get install git wget curl net-tools nmap htop python3-pip python3-venv zip openssh-server gimp wireguard -y
 
 # COMMENTER LES LIGNES DES INSTALLATIONS NON VOULUES:
 
 # VSCODIUM
-./scripts/vscodium-install.sh
+./scripts/vscodium_install.sh
 
 # TABBY
 ./scripts/tabby_install.sh
 
 # DOCKER
-./scripts/docker-install.sh
-
-# DOCKER COMPOSE
-./scripts/docker-compose.sh
+./scripts/docker_install.sh
 
 # VIRTUALBOX
-./scripts/virtualbox-install.sh
+./scripts/virtualbox_install.sh
 
 # VAGRANT
-./scripts/vagrant-install.sh
+./scripts/vagrant_install.sh
 
 # JENKINS
-./scripts/jenkins-install.sh
+#./scripts/jenkins_install.sh
 
 # KUBERNETES
-./scripts/kubernetes-install.sh
+#./scripts/kubernetes_install.sh
 
 # CMATRIX SCREENSAVER
-./scripts/cmatrix-install.sh
+./scripts/cmatrix_install.sh
 
 echo "\n
 ██████╗  ██████╗ ███╗   ██╗███████╗██╗
@@ -65,4 +62,4 @@ echo "\n
 ██║  ██║██║   ██║██╔██╗ ██║█████╗  ██║
 ██║  ██║██║   ██║██║╚██╗██║██╔══╝  ╚═╝
 ██████╔╝╚██████╔╝██║ ╚████║███████╗██╗
-╚═════╝  ╚═════╝ ╚═╝  ╚═══╝╚══════╝╚═╝"
+╚═════╝  ╚═════╝ ╚═╝  ╚═══╝╚══════╝╚═╝"

scripts/docker_compose.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# INSTALL DOCKER-COMPOSE FOR DEBIAN 11
-sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
-sudo chmod +x /usr/local/bin/docker-compose
-sudo ln -s /usr/local/bin/docker-compose /usr/bin/docker-compose
-docker-compose --version

scripts/docker_install.sh

@@ -8,24 +8,23 @@ echo "/n
 ██████╔╝╚██████╔╝╚██████╗██║  ██╗███████╗██║  ██║
 ╚═════╝  ╚═════╝  ╚═════╝╚═╝  ╚═╝╚══════╝╚═╝  ╚═╝"
 
-# INSTALL DOCKER FOR DEBIAN 11
+# INSTALL DOCKER AND COMPOSE FOR DEBIAN 12
+
 sudo apt-get update
+sudo apt-get install ca-certificates curl gnupg
+
+sudo install -m 0755 -d /etc/apt/keyrings
+curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+sudo chmod a+r /etc/apt/keyrings/docker.gpg
 
-sudo apt-get install \
-    ca-certificates \
-    curl \
-    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
-sudo apt-get install docker-ce docker-ce-cli containerd.io
+  "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian \
+  "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | \
+  sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
 
-### DOCKER WITHOUT SUDO:
-sudo groupadd -f docker
-sudo chown root:docker /var/run/docker.sock
-sudo usermod -a -G docker "$(whoami)"
+sudo apt-get update && sudo apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
+
+sudo usermod -aG docker $(whoami)
 newgrp docker
-sudo systemctl restart docker
+
+exit 0