diff --git a/install.linux.sh b/install.linux.sh index 090297c9113cebf1e65032a3f450cd78ebd2c35a..43f61bbaa439f3b1bcff7cd6825b481d728be4cb 100755 --- a/install.linux.sh +++ b/install.linux.sh @@ -1,5 +1,7 @@ #!/bin/bash +#This script is tested on Debian 12 + #Current version of libre.sh to be installed LIBRE_VERSION=1.2 # System env vars : can be overrided by a values.env file next to this install file @@ -54,6 +56,7 @@ MAIL_USER= MAIL_PASS= MAIL_HOST=mail.indie.host MAIL_PORT=587 +MAIL_SECURITY= # Default admin emails for apps @@ -94,7 +97,7 @@ echo "ADMIN_EMAIL=${ADMIN_EMAIL}" >> /etc/environment # STEP Install Docker -name="docker-ce" +name="docker.io" # TODO : Fix a version for docker ? dpkg -s $name &> /dev/null @@ -104,23 +107,27 @@ name="docker-ce" then echo "$name not installed" apt-get update - curl -fsSL https://get.docker.com -o get-docker.sh - sh get-docker.sh - echo "-------- Latest docker installed " +# curl -fsSL https://get.docker.com -o get-docker.sh +# sh get-docker.sh + apt install -y $name + echo "-------- Native docker installed " else echo "$name already installed" fi # STEP "install docker-compose" -echo "-------- Install latest docker-compose " +echo "-------- Install native docker-compose " # TODO : Fix a version for docker compose ? -mkdir -p /opt/bin &&\ -dockerComposeVersion=$(curl -s https://api.github.com/repos/docker/compose/releases/latest|grep tag_name|cut -d'"' -f4) &&\ -curl -L https://github.com/docker/compose/releases/download/$dockerComposeVersion/docker-compose-`uname -s`-`uname -m` > /opt/bin/docker-compose &&\ -chmod +x /opt/bin/docker-compose +#mkdir -p /opt/bin &&\ +#dockerComposeVersion=$(curl -s https://api.github.com/repos/docker/compose/releases/latest|grep tag_name|cut -d'"' -f4) &&\ +#curl -L https://github.com/docker/compose/releases/download/$dockerComposeVersion/docker-compose-`uname -s`-`uname -m` > /opt/bin/#docker-compose &&\ +#chmod +x /opt/bin/docker-compose + +apt install -y docker-compose + # STEP "install git"