From 5a4f171f6d80179af87ace381f077f6897b6e572 Mon Sep 17 00:00:00 2001
From: Stefan Pejcic <stefan@pejcic.rs>
Date: Fri, 28 Jun 2024 14:20:09 +0200
Subject: [PATCH] Update INSTALL.sh

---
 version/0.2.1/INSTALL.sh | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/version/0.2.1/INSTALL.sh b/version/0.2.1/INSTALL.sh
index 27ce1668..fc4b39f1 100644
--- a/version/0.2.1/INSTALL.sh
+++ b/version/0.2.1/INSTALL.sh
@@ -198,14 +198,12 @@ FUNCTIONS=(
 detect_os_and_package_manager
 update_package_manager
 install_packages
-
-download_and_import_docker_images
-
 download_skeleton_directory_from_github
 install_openadmin
 opencli_setup
 add_file_watcher
 configure_docker
+download_and_import_docker_images
 docker_compose_up
 #docker_compose_check_health
 panel_customize
@@ -529,6 +527,8 @@ configure_docker() {
     docker_daemon_json_path="/etc/docker/daemon.json"
     mkdir -p $(dirname "$docker_daemon_json_path")
 
+    
+    
     if [ "$OVERLAY" = true ]; then
         echo "Setting 'overlay2' as the default storage driver for Docker.."
         cp ${ETC_DIR}docker/overlay2/daemon.json "$docker_daemon_json_path"
@@ -896,7 +896,8 @@ opencli_setup(){
     mkdir -p ${TEMP_DIR}opencli
     cd ${TEMP_DIR} && tar -xzf opencli.tar.gz -C ${TEMP_DIR}opencli
     cp -r ${TEMP_DIR}opencli/opencli-main /usr/local/admin/scripts
-    rm ${TEMP_DIR}opencli.tar.gz ${TEMP_DIR}opencli
+    rm ${TEMP_DIR}opencli.tar.gz 
+    rm -rf ${TEMP_DIR}opencli
 
     cp /usr/local/admin/scripts/opencli /usr/local/bin/opencli
     chmod +x /usr/local/bin/opencli
@@ -1156,6 +1157,10 @@ install_openadmin(){
         git clone -b $current_python_version --single-branch https://github.com/stefanpejcic/openadmin $OPENPADMIN_DIR
         cd $OPENPADMIN_DIR
         debug_log pip install -r requirements.txt --break-system-packages
+
+        # on ubuntu24 we need to use overlay instead of devicemapper!
+        OVERLAY=true
+        
     # Debian12
     elif [ -f /etc/debian_version ]; then
         echo "Installing PIP and Git"