Browse Source

Update configure script with better support for sub os like raspian

Nicolas Meienberger 3 years ago
parent
commit
486b0fbb26
2 changed files with 33 additions and 11 deletions
  1. 1 1
      Dockerfile
  2. 32 10
      scripts/configure.sh

+ 1 - 1
Dockerfile

@@ -20,7 +20,7 @@ COPY ./packages/dashboard /dashboard
 RUN npm run build
 
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 ARG DEBIAN_FRONTEND=noninteractive
 
 WORKDIR /

+ 32 - 10
scripts/configure.sh

@@ -14,15 +14,10 @@ echo "=============== TIPI ================="
 echo "======================================"
 echo
 
-OS="$(cat /etc/[A-Za-z]*[_-][rv]e[lr]* | grep "^ID=" | cut -d= -f2 | uniq | tr '[:upper:]' '[:lower:]' | tr -d '"')"
-SUB_OS="$(cat /etc/[A-Za-z]*[_-][rv]e[lr]* | grep "^ID_LIKE=" | cut -d= -f2 | uniq | tr '[:upper:]' '[:lower:]' | tr -d '"')"
-
+function install_docker() {
+  local os="${1}"
 
-if command -v docker >/dev/null; then
-  echo "Docker is already installed"
-else
-  echo "Installing Docker"
-  if [[ "${OS}" == "debian" || "${SUB_OS}" == "debian" ]]; then
+  if [[ "${OS}" == "debian" ]]; then
     sudo apt-get update
     sudo apt-get install -y ca-certificates curl gnupg jq lsb-release
     sudo mkdir -p /etc/apt/keyrings
@@ -30,6 +25,7 @@ else
     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
     sudo apt-get update
     sudo apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin
+    echo "sucess"
   elif [[ "${OS}" == "ubuntu" ]]; then
     sudo apt-get update
     sudo apt-get install -y ca-certificates curl gnupg jq lsb-release
@@ -38,18 +34,21 @@ else
     echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list >/dev/null
     sudo apt-get update
     sudo apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin
+    echo "sucess"
   elif [[ "${OS}" == "centos" ]]; then
     sudo yum install -y yum-utils jq
     sudo yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
     sudo yum install -y --allowerasing docker-ce docker-ce-cli containerd.io docker-compose-plugin
     sudo systemctl start docker
     sudo systemctl enable docker
+    echo "sucess"
   elif [[ "${OS}" == "fedora" ]]; then
     sudo dnf -y install dnf-plugins-core jq
     sudo dnf config-manager --add-repo https://download.docker.com/linux/fedora/docker-ce.repo
     sudo dnf -y install docker-ce docker-ce-cli containerd.io docker-compose-plugin
     sudo systemctl start docker
     sudo systemctl enable docker
+    echo "sucess"
   elif [[ "${OS}" == "arch" ]]; then
     sudo pacman -Sy --noconfirm docker jq
     sudo systemctl start docker.service
@@ -59,9 +58,32 @@ else
       sudo pacman -Sy --noconfirm cronie
       systemctl enable --now cronie.service
     fi
+
+    echo "sucess"
+  else
+    echo "error"
+  fi
+}
+
+OS="$(cat /etc/[A-Za-z]*[_-][rv]e[lr]* | grep "^ID=" | cut -d= -f2 | uniq | tr '[:upper:]' '[:lower:]' | tr -d '"')"
+SUB_OS="$(cat /etc/[A-Za-z]*[_-][rv]e[lr]* | grep "^ID_LIKE=" | cut -d= -f2 | uniq | tr '[:upper:]' '[:lower:]' | tr -d '"')"
+
+if command -v docker >/dev/null; then
+  echo "Docker is already installed"
+else
+  echo "Installing Docker"
+  DOCKER_SUCCESS=$(install_docker "${OS}")
+  if [[ "${DOCKER_SUCCESS}" == "sucess" ]]; then
+    echo "docker installed"
   else
-    echo "Your OS ${OS} is not supported by this script. Please install docker and docker-compose manually."
-    exit 1
+    DOCKER_SUCCESS=$(install_docker "${SUB_OS}")
+
+    if [[ "${DOCKER_SUCCESS}" == "sucess" ]]; then
+      echo "docker installed"
+    else
+      echo "Your system ${OS} is not supported please install docker manually"
+      exit 1
+    fi
   fi
 fi