From 531ecad4c757b3b3b36ac21d2526d036647e5107 Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Sun, 7 Dec 2025 21:48:00 +0100 Subject: [PATCH] Refactor: Inventree (uses now ubuntu 24.04) (#9752) --- ct/inventree.sh | 14 +++++++++---- frontend/public/json/inventree.json | 4 ++-- install/inventree-install.sh | 32 ++++++++++++++++------------- 3 files changed, 30 insertions(+), 20 deletions(-) diff --git a/ct/inventree.sh b/ct/inventree.sh index 81108e358c..e91f8d74e7 100644 --- a/ct/inventree.sh +++ b/ct/inventree.sh @@ -10,8 +10,8 @@ var_tags="${var_tags:-inventory}" var_cpu="${var_cpu:-2}" var_ram="${var_ram:-2048}" var_disk="${var_disk:-6}" -var_os="${var_os:-debian}" -var_version="${var_version:-13}" +var_os="${var_os:-ubuntu}" +var_version="${var_version:-24.04}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" @@ -28,10 +28,16 @@ function update_script() { msg_error "No ${APP} Installation Found!" exit fi - msg_info "Updating $APP" + + if ! grep -qE "^ID=(ubuntu)$" /etc/os-release; then + msg_error "Unsupported OS. InvenTree requires Ubuntu (20.04/22.04/24.04)." + exit + fi + + msg_info "Updating InvenTree" $STD apt update $STD apt install --only-upgrade inventree -y - msg_ok "Updated $APP" + msg_ok "Updated InvenTree" msg_ok "Updated successfully!" exit } diff --git a/frontend/public/json/inventree.json b/frontend/public/json/inventree.json index 886a9b2ddc..84e5cefdf4 100644 --- a/frontend/public/json/inventree.json +++ b/frontend/public/json/inventree.json @@ -22,8 +22,8 @@ "cpu": 2, "ram": 2048, "hdd": 6, - "os": "debian", - "version": "13" + "os": "ubuntu", + "version": "24.04" } } ], diff --git a/install/inventree-install.sh b/install/inventree-install.sh index 61af0723c7..d73bb538ce 100644 --- a/install/inventree-install.sh +++ b/install/inventree-install.sh @@ -13,23 +13,27 @@ setting_up_container network_check update_os -msg_info "Installing Dependencies" -temp_file=$(mktemp) -curl -fsSL "http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_amd64.deb" -o "$temp_file" -$STD dpkg -i $temp_file -rm -f $temp_file -msg_ok "Installed Dependencies" - msg_info "Setting up InvenTree Repository" -mkdir -p /etc/apt/keyrings -curl -fsSL https://dl.packager.io/srv/inventree/InvenTree/key | gpg --dearmor -o /etc/apt/keyrings/inventree.gpg -echo "deb [signed-by=/etc/apt/keyrings/inventree.gpg] https://dl.packager.io/srv/deb/inventree/InvenTree/stable/ubuntu 20.04 main" >/etc/apt/sources.list.d/inventree.list +setup_deb822_repo \ + "inventree" \ + "https://dl.packager.io/srv/inventree/InvenTree/key" \ + "https://dl.packager.io/srv/deb/inventree/InvenTree/stable/$(get_os_info id)" \ + "$(get_os_info version)" \ + "main" msg_ok "Set up InvenTree Repository" -msg_info "Setup ${APPLICATION} (Patience)" -$STD apt-get update -$STD apt-get install -y inventree -msg_ok "Setup ${APPLICATION}" +msg_info "Installing InvenTree (Patience)" +export SETUP_NO_CALLS=true +$STD apt install -y inventree +msg_ok "Installed InvenTree" + +msg_info "Configuring InvenTree" +LOCAL_IP="$(hostname -I | awk '{print $1}')" +if [[ -f /etc/inventree/config.yaml ]]; then + sed -i "s|site_url:.*|site_url: http://${LOCAL_IP}|" /etc/inventree/config.yaml +fi +$STD inventree run invoke update +msg_ok "Configured InvenTree" motd_ssh customize