Explorar el Código

Update configure.sh to use pacapt on non-Debian/non-Ubuntu systems. This will allow the same ease of installing and setting up tipi as before.

Justin Trujillo hace 3 años
padre
commit
03d92b7c18
Se han modificado 1 ficheros con 39 adiciones y 33 borrados
  1. 39 33
      scripts/configure.sh

+ 39 - 33
scripts/configure.sh

@@ -14,39 +14,45 @@ echo "=============== TIPI ================="
 echo "======================================"
 echo
 
-sudo apt-get update
-sudo apt-get install -y jq coreutils ca-certificates curl gnupg lsb-release
-
-LSB="$(lsb_release -is)"
-
-# Add docker gpg key (Debian)
-if [[ "${LSB}" == "Debian" ]]; then
-  curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
-fi
-
-# Add docker gpg key (Ubuntu)
-if [[ "${LSB}" == "Ubuntu" ]]; then
-  curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
-fi
-
-# Add deb repo for docker (Debian)
-if [[ "${LSB}" == "Debian" ]]; then
-  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
-fi
-
-# Add deb repo for docker (Ubuntu)
-if [[ "${LSB}" == "Ubuntu" ]]; then
-  echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list >/dev/null
-fi
-
-sudo apt-get update
-sudo apt-get install -y docker-ce docker-ce-cli containerd.io
-
-# Install docker compose if not here
-if ! command -v docker-compose >/dev/null; then
-  sudo curl -L "https://github.com/docker/compose/releases/download/v2.3.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
-  sudo chmod +x /usr/local/bin/docker-compose
+ID="$(grep -E '^ID=' /etc/os-release | awk -F'=' '{print $2}')"
+if [[ $ID == 'debian' || $ID == 'ubuntu' ]]; then
+
+  sudo apt-get update
+  sudo apt-get install -y jq coreutils ca-certificates curl gnupg lsb-release
+
+  LSB="$(lsb_release -is)"
+
+  # Add docker gpg key (Debian)
+  if [[ "${LSB}" == "Debian" ]]; then
+    curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
+  fi
+
+  # Add docker gpg key (Ubuntu)
+  if [[ "${LSB}" == "Ubuntu" ]]; then
+    curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
+  fi
+
+  # Add deb repo for docker (Debian)
+  if [[ "${LSB}" == "Debian" ]]; then
+    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
+  fi
+
+  # Add deb repo for docker (Ubuntu)
+  if [[ "${LSB}" == "Ubuntu" ]]; then
+    echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list >/dev/null
+  fi
+
+  sudo apt-get update
+  sudo apt-get install -y docker-ce docker-ce-cli containerd.io
+
+  # Install docker compose if not here
+  if ! command -v docker-compose >/dev/null; then
+    sudo curl -L "https://github.com/docker/compose/releases/download/v2.3.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+    sudo chmod +x /usr/local/bin/docker-compose
+  fi
+else
+  curl -LO https://github.com/icy/pacapt/raw/ng/pacapt && sudo bash pacapt -Sy docker docker-compose && rm pacapt && echo done
 fi
-
+sudo usermod -aG docker $USER
 # Create configured status
 touch "${ROOT_FOLDER}/state/configured"