From 714c2e588856117ff7278ca56db356765c809630 Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Wed, 12 Nov 2025 10:56:18 +0100 Subject: [PATCH] Bump K to H-Scripts to Debian 13 (Trixie) (#8597) * Update scripts to use Debian 13 and improve update logic Bump default container OS version from Debian 12 to 13 across multiple LXC setup scripts. Refactor update_script functions for consistency, improve messaging, and standardize apt usage. Update Kimai install and update scripts to use setup_php, setup_composer, and fetch_and_deploy_gh_release helpers, and switch from MySQL to MariaDB. Update Kometa to use Python 3.13. Minor improvements to backup, cleanup, and service management steps in several scripts. * Refactor install scripts: unify cleanup and apt usage Replaces repeated apt-get commands with apt for installing dependencies, and consolidates cleanup steps into a single cleanup_lxc function across all install scripts. Also updates repository setup to use setup_deb822_repo where applicable, and makes minor improvements to dependency installation and service setup. * Update default Debian version to 13 and refactor updates Set the default Debian version to 13 across all container scripts. Standardize apt command usage by replacing 'apt-get' with 'apt' where appropriate. Remove redundant cleanup steps from update scripts and streamline update logic for consistency. Also, call 'cleanup_lxc' after 'update_script' in the build function. * Update default OS version to Debian 13 in JSON configs Updated the 'version' field from '12' to '13' for Debian-based install methods across multiple application JSON files. Also set default OS and version for inspircd. This ensures new containers use the latest supported Debian release. * fix kimai Update Check * grammar * Correct typo in success message * Fix typo in success message for update * refactor * fixed jenkins / improve komodo --------- Co-authored-by: Tobias <96661824+CrazyWolf13@users.noreply.github.com> --- ct/headscale.sh | 2 +- ct/healthchecks.sh | 5 +- ct/hivemq.sh | 20 ++--- ct/homarr.sh | 2 +- ct/homeassistant.sh | 2 +- ct/homebox.sh | 2 +- ct/homebridge.sh | 24 +++--- ct/hortusfox.sh | 7 +- ct/huntarr.sh | 2 +- ct/hyperhdr.sh | 4 +- ct/hyperion.sh | 6 +- ct/immich.sh | 14 +--- ct/influxdb.sh | 6 +- ct/inspircd.sh | 2 +- ct/inventree.sh | 6 +- ct/iobroker.sh | 8 +- ct/itsm-ng.sh | 13 ++- ct/iventoy.sh | 2 +- ct/jackett.sh | 18 ++-- ct/jeedom.sh | 4 +- ct/jenkins.sh | 15 ++-- ct/joplin-server.sh | 8 +- ct/kapowarr.sh | 6 +- ct/karakeep.sh | 18 ++-- ct/kasm.sh | 11 ++- ct/keycloak.sh | 14 ++-- ct/kimai.sh | 18 ++-- ct/koillection.sh | 8 +- ct/kometa.sh | 6 +- ct/komga.sh | 2 +- ct/komodo.sh | 16 ++-- ct/kubo.sh | 2 +- frontend/public/json/headscale.json | 2 +- frontend/public/json/healthchecks.json | 2 +- frontend/public/json/hivemq.json | 2 +- frontend/public/json/homarr.json | 2 +- frontend/public/json/homeassistant.json | 106 ++++++++++++------------ frontend/public/json/homebox.json | 2 +- frontend/public/json/homebridge.json | 2 +- frontend/public/json/homer.json | 2 +- frontend/public/json/hortusfox.json | 2 +- frontend/public/json/huntarr.json | 2 +- frontend/public/json/hyperhdr.json | 2 +- frontend/public/json/hyperion.json | 2 +- frontend/public/json/influxdb.json | 2 +- frontend/public/json/inspircd.json | 4 +- frontend/public/json/inventree.json | 2 +- frontend/public/json/iobroker.json | 2 +- frontend/public/json/itsm-ng.json | 2 +- frontend/public/json/iventoy.json | 2 +- frontend/public/json/jackett.json | 2 +- frontend/public/json/jenkins.json | 2 +- frontend/public/json/joplin-server.json | 2 +- frontend/public/json/kapowarr.json | 2 +- frontend/public/json/karakeep.json | 2 +- frontend/public/json/kasm.json | 2 +- frontend/public/json/keycloak.json | 2 +- frontend/public/json/kimai.json | 2 +- frontend/public/json/koillection.json | 2 +- frontend/public/json/kometa.json | 2 +- frontend/public/json/komodo.json | 2 +- frontend/public/json/kubo.json | 2 +- install/habitica-install.sh | 8 +- install/headscale-install.sh | 10 +-- install/healthchecks-install.sh | 11 +-- install/hivemq-install.sh | 6 +- install/homarr-install.sh | 8 +- install/homeassistant-install.sh | 8 +- install/homebox-install.sh | 6 +- install/homebridge-install.sh | 18 ++-- install/hortusfox-install.sh | 10 +-- install/huntarr-install.sh | 10 +-- install/hyperhdr-install.sh | 17 ++-- install/hyperion-install.sh | 26 +++--- install/immich-install.sh | 41 ++++----- install/influxdb-install.sh | 31 +++---- install/inspircd-install.sh | 6 +- install/iobroker-install.sh | 8 +- install/itsm-ng-install.sh | 16 ++-- install/jackett-install.sh | 6 +- install/jeedom-install.sh | 7 +- install/jellyfin-install.sh | 7 +- install/jenkins-install.sh | 14 +--- install/joplin-server-install.sh | 10 +-- install/jotty-install.sh | 7 +- install/jupyternotebook-install.sh | 6 +- install/kapowarr-install.sh | 14 ++-- install/karakeep-install.sh | 8 +- install/kasm-install.sh | 6 +- install/kavita-install.sh | 7 +- install/keycloak-install.sh | 6 +- install/kimai-install.sh | 22 ++--- install/koillection-install.sh | 6 +- install/kometa-install.sh | 8 +- install/komga-install.sh | 7 +- install/komodo-install.sh | 27 ++---- install/kubo-install.sh | 6 +- misc/build.func | 1 + 98 files changed, 338 insertions(+), 516 deletions(-) diff --git a/ct/headscale.sh b/ct/headscale.sh index dbacfd6fa..fa06431dc 100644 --- a/ct/headscale.sh +++ b/ct/headscale.sh @@ -11,7 +11,7 @@ var_cpu="${var_cpu:-1}" var_ram="${var_ram:-512}" var_disk="${var_disk:-2}" var_os="${var_os:-debian}" -var_version="${var_version:-12}" +var_version="${var_version:-13}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" diff --git a/ct/healthchecks.sh b/ct/healthchecks.sh index 30e67654d..7e6b714ca 100644 --- a/ct/healthchecks.sh +++ b/ct/healthchecks.sh @@ -11,7 +11,7 @@ var_cpu="${var_cpu:-2}" var_ram="${var_ram:-2048}" var_disk="${var_disk:-5}" var_os="${var_os:-debian}" -var_version="${var_version:-12}" +var_version="${var_version:-13}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" @@ -33,7 +33,7 @@ function update_script() { systemctl stop healthchecks msg_ok "Stopped Services" - setup_uv + PYTHON_VERSION="3.12" setup_uv fetch_and_deploy_gh_release "healthchecks" "healthchecks/healthchecks" msg_info "Updating healthchecks" @@ -45,7 +45,6 @@ function update_script() { $STD uv run -- python manage.py collectstatic --noinput $STD uv run -- python manage.py compress msg_ok "Updated healthchecks" - msg_info "Starting Services" systemctl start healthchecks systemctl restart caddy diff --git a/ct/hivemq.sh b/ct/hivemq.sh index 384d10e3d..a851f1ad3 100644 --- a/ct/hivemq.sh +++ b/ct/hivemq.sh @@ -11,7 +11,7 @@ var_cpu="${var_cpu:-1}" var_ram="${var_ram:-1024}" var_disk="${var_disk:-4}" var_os="${var_os:-debian}" -var_version="${var_version:-12}" +var_version="${var_version:-13}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" @@ -20,15 +20,15 @@ color catch_errors function update_script() { - header_info - check_container_storage - check_container_resources - if [[ ! -d /var ]]; then - msg_error "No ${APP} Installation Found!" - exit - fi - msg_error "Currently we don't provide an update function for this ${APP}." + header_info + check_container_storage + check_container_resources + if [[ ! -d /var ]]; then + msg_error "No ${APP} Installation Found!" exit + fi + msg_error "Currently we don't provide an update function for this ${APP}." + exit } start @@ -36,4 +36,4 @@ build_container description msg_ok "Completed Successfully!\n" -echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}" \ No newline at end of file +echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}" diff --git a/ct/homarr.sh b/ct/homarr.sh index 6a19924c1..7aaec5188 100644 --- a/ct/homarr.sh +++ b/ct/homarr.sh @@ -11,7 +11,7 @@ var_cpu="${var_cpu:-3}" var_ram="${var_ram:-6144}" var_disk="${var_disk:-8}" var_os="${var_os:-debian}" -var_version="${var_version:-12}" +var_version="${var_version:-13}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" diff --git a/ct/homeassistant.sh b/ct/homeassistant.sh index 6201915b9..f4c7006aa 100644 --- a/ct/homeassistant.sh +++ b/ct/homeassistant.sh @@ -11,7 +11,7 @@ var_cpu="${var_cpu:-2}" var_ram="${var_ram:-2048}" var_disk="${var_disk:-16}" var_os="${var_os:-debian}" -var_version="${var_version:-12}" +var_version="${var_version:-13}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" diff --git a/ct/homebox.sh b/ct/homebox.sh index f09276712..03287ac13 100644 --- a/ct/homebox.sh +++ b/ct/homebox.sh @@ -11,7 +11,7 @@ var_cpu="${var_cpu:-1}" var_ram="${var_ram:-1024}" var_disk="${var_disk:-4}" var_os="${var_os:-debian}" -var_version="${var_version:-12}" +var_version="${var_version:-13}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" diff --git a/ct/homebridge.sh b/ct/homebridge.sh index 1a01cc4c0..1635248ab 100644 --- a/ct/homebridge.sh +++ b/ct/homebridge.sh @@ -11,7 +11,7 @@ var_cpu="${var_cpu:-1}" var_ram="${var_ram:-1024}" var_disk="${var_disk:-4}" var_os="${var_os:-debian}" -var_version="${var_version:-12}" +var_version="${var_version:-13}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" @@ -20,18 +20,18 @@ color catch_errors function update_script() { - header_info - check_container_storage - check_container_resources - if [[ ! -f /etc/apt/sources.list.d/homebridge.list ]]; then - msg_error "No ${APP} Installation Found!" - exit - fi - msg_info "Updating ${APP} LXC" - $STD apt-get update - $STD apt-get install -y homebridge - msg_ok "Updated successfully!" + header_info + check_container_storage + check_container_resources + if [[ ! -f /etc/apt/sources.list.d/homebridge.list ]]; then + msg_error "No ${APP} Installation Found!" exit + fi + msg_info "Updating ${APP} LXC" + $STD apt update + $STD apt install -y homebridge + msg_ok "Updated successfully!" + exit } start diff --git a/ct/hortusfox.sh b/ct/hortusfox.sh index 69a888a2e..926629b0a 100644 --- a/ct/hortusfox.sh +++ b/ct/hortusfox.sh @@ -11,7 +11,7 @@ var_cpu="${var_cpu:-2}" var_ram="${var_ram:-2048}" var_disk="${var_disk:-5}" var_os="${var_os:-debian}" -var_version="${var_version:-12}" +var_version="${var_version:-13}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" @@ -47,15 +47,12 @@ function update_script() { $STD php asatru plants:attributes $STD php asatru calendar:classes chown -R www-data:www-data /opt/hortusfox + rm -r /opt/hortusfox-backup msg_ok "Updated HortusFox" msg_info "Starting Service" systemctl start apache2 msg_ok "Started Service" - - msg_info "Cleaning up" - rm -r /opt/hortusfox-backup - msg_ok "Cleaned" msg_ok "Updated successfully!" fi exit diff --git a/ct/huntarr.sh b/ct/huntarr.sh index 06e9248a0..7ab5aae41 100644 --- a/ct/huntarr.sh +++ b/ct/huntarr.sh @@ -11,7 +11,7 @@ var_cpu="${var_cpu:-2}" var_ram="${var_ram:-1024}" var_disk="${var_disk:-4}" var_os="${var_os:-debian}" -var_version="${var_version:-12}" +var_version="${var_version:-13}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" diff --git a/ct/hyperhdr.sh b/ct/hyperhdr.sh index 3c3af7ae5..cc001476d 100644 --- a/ct/hyperhdr.sh +++ b/ct/hyperhdr.sh @@ -28,8 +28,8 @@ function update_script() { exit fi msg_info "Updating $APP LXC" - $STD apt-get update - $STD apt-get -y upgrade + $STD apt update + $STD apt -y upgrade msg_ok "Updated $APP LXC" msg_ok "Updated successfully!" exit diff --git a/ct/hyperion.sh b/ct/hyperion.sh index 15c838c80..3f0bfee35 100644 --- a/ct/hyperion.sh +++ b/ct/hyperion.sh @@ -11,7 +11,7 @@ var_cpu="${var_cpu:-1}" var_ram="${var_ram:-512}" var_disk="${var_disk:-2}" var_os="${var_os:-debian}" -var_version="${var_version:-12}" +var_version="${var_version:-13}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" @@ -28,8 +28,8 @@ function update_script() { exit fi msg_info "Updating ${APP} LXC" - $STD apt-get update - $STD apt-get install -y hyperion + $STD apt update + $STD apt install -y hyperion msg_ok "Updated successfully!" exit } diff --git a/ct/immich.sh b/ct/immich.sh index 314a2b5cc..d414beb70 100644 --- a/ct/immich.sh +++ b/ct/immich.sh @@ -54,10 +54,10 @@ EOF if [[ -f /etc/apt/preferences.d/immich ]]; then rm /etc/apt/preferences.d/immich fi - $STD apt-get update + $STD apt update msg_ok "Added Debian Testing repo" msg_info "Installing libmimalloc3" - $STD apt-get install -t testing --no-install-recommends libmimalloc3 + $STD apt install -t testing --no-install-recommends libmimalloc3 msg_ok "Installed libmimalloc3" fi @@ -114,7 +114,7 @@ EOF msg_ok "Upgraded VectorChord to v${VCHORD_RELEASE}" fi if ! dpkg -l | grep -q ccache; then - $STD apt-get install -yqq ccache + $STD apt install -yqq ccache fi INSTALL_DIR="/opt/${APP}" @@ -213,12 +213,6 @@ EOF chown -R immich:immich "$INSTALL_DIR" msg_ok "Updated ${APP} to v${RELEASE}" - - msg_info "Cleaning up" - $STD apt-get -y autoremove - $STD apt-get -y autoclean - $STD apt clean -y - msg_ok "Cleaned" systemctl restart immich-ml immich-web fi exit @@ -272,7 +266,7 @@ function compile_libjxl() { function compile_libheif() { SOURCE=${SOURCE_DIR}/libheif if ! dpkg -l | grep -q libaom; then - $STD apt-get install -y libaom-dev + $STD apt install -y libaom-dev local update="required" fi : "${LIBHEIF_REVISION:=$(jq -cr '.revision' "$BASE_DIR"/server/sources/libheif.json)}" diff --git a/ct/influxdb.sh b/ct/influxdb.sh index 205b55926..ead8db84b 100644 --- a/ct/influxdb.sh +++ b/ct/influxdb.sh @@ -11,7 +11,7 @@ var_cpu="${var_cpu:-2}" var_ram="${var_ram:-2048}" var_disk="${var_disk:-8}" var_os="${var_os:-debian}" -var_version="${var_version:-12}" +var_version="${var_version:-13}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" @@ -28,8 +28,8 @@ function update_script() { exit fi msg_info "Updating ${APP}" - $STD apt-get update - $STD apt-get -y upgrade + $STD apt update + $STD apt -y upgrade msg_ok "Updated successfully!" exit } diff --git a/ct/inspircd.sh b/ct/inspircd.sh index 92ca27caa..f92e36022 100644 --- a/ct/inspircd.sh +++ b/ct/inspircd.sh @@ -11,7 +11,7 @@ var_cpu="${var_cpu:-1}" var_ram="${var_ram:-512}" var_disk="${var_disk:-2}" var_os="${var_os:-debian}" -var_version="${var_version:-12}" +var_version="${var_version:-13}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" diff --git a/ct/inventree.sh b/ct/inventree.sh index 21e479e1e..81108e358 100644 --- a/ct/inventree.sh +++ b/ct/inventree.sh @@ -11,7 +11,7 @@ var_cpu="${var_cpu:-2}" var_ram="${var_ram:-2048}" var_disk="${var_disk:-6}" var_os="${var_os:-debian}" -var_version="${var_version:-12}" +var_version="${var_version:-13}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" @@ -29,8 +29,8 @@ function update_script() { exit fi msg_info "Updating $APP" - $STD apt-get update - $STD apt-get install --only-upgrade inventree -y + $STD apt update + $STD apt install --only-upgrade inventree -y msg_ok "Updated $APP" msg_ok "Updated successfully!" exit diff --git a/ct/iobroker.sh b/ct/iobroker.sh index 9a89f0c74..ca3fecfd0 100644 --- a/ct/iobroker.sh +++ b/ct/iobroker.sh @@ -11,7 +11,7 @@ var_cpu="${var_cpu:-2}" var_ram="${var_ram:-2048}" var_disk="${var_disk:-8}" var_os="${var_os:-debian}" -var_version="${var_version:-12}" +var_version="${var_version:-13}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" @@ -28,9 +28,9 @@ function update_script() { exit fi msg_info "Updating ${APP} LXC" - $STD apt-get update - $STD apt-get -y upgrade - msg_ok "Updated successfully!" + $STD apt update + $STD apt -y upgrade + msg_ok "Updated Successfully" exit } diff --git a/ct/itsm-ng.sh b/ct/itsm-ng.sh index 562d209f2..d7e6dfbc4 100644 --- a/ct/itsm-ng.sh +++ b/ct/itsm-ng.sh @@ -11,7 +11,7 @@ var_cpu="${var_cpu:-2}" var_ram="${var_ram:-2048}" var_disk="${var_disk:-10}" var_os="${var_os:-debian}" -var_version="${var_version:-12}" +var_version="${var_version:-13}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" @@ -26,14 +26,13 @@ function update_script() { if [[ ! -f /etc/itsm-ng/config_db.php ]]; then msg_error "No ${APP} Installation Found!" - exit + exit 1 fi - msg_info "Updating ${APP} LXC" - $STD apt-get update - $STD apt-get -y upgrade - msg_ok "Updated successfully!" - + msg_info "Updating LXC" + $STD apt update + $STD apt -y upgrade + msg_ok "Updated Successfully!" exit } diff --git a/ct/iventoy.sh b/ct/iventoy.sh index 86f53d64c..375e06a56 100644 --- a/ct/iventoy.sh +++ b/ct/iventoy.sh @@ -11,7 +11,7 @@ var_disk="${var_disk:-2}" var_cpu="${var_cpu:-1}" var_ram="${var_ram:-512}" var_os="${var_os:-debian}" -var_version="${var_version:-12}" +var_version="${var_version:-13}" var_unprivileged="${var_unprivileged:-0}" header_info "$APP" diff --git a/ct/jackett.sh b/ct/jackett.sh index 3b06c2934..107f2f524 100644 --- a/ct/jackett.sh +++ b/ct/jackett.sh @@ -11,7 +11,7 @@ var_cpu="${var_cpu:-1}" var_ram="${var_ram:-512}" var_disk="${var_disk:-2}" var_os="${var_os:-debian}" -var_version="${var_version:-12}" +var_version="${var_version:-13}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" @@ -28,24 +28,24 @@ function update_script() { exit fi - if [ ! -f /opt/.env ]; then - sed -i 's|^Environment="DisableRootWarning=true"$|EnvironmentFile="/opt/.env"|' /etc/systemd/system/jackett.service - cat </opt/.env + if check_for_gh_release "Jackett" "Jackett/Jackett"; then + if [ ! -f /opt/.env ]; then + sed -i 's|^Environment="DisableRootWarning=true"$|EnvironmentFile="/opt/.env"|' /etc/systemd/system/jackett.service + cat </opt/.env DisableRootWarning=true EOF - fi - if check_for_gh_release "Jackett" "Jackett/Jackett"; then + fi + msg_info "Stopping Service" systemctl stop jackett msg_ok "Stopped Service" - rm -rf /opt/Jackett - fetch_and_deploy_gh_release "jackett" "Jackett/Jackett" "prebuild" "latest" "/opt/Jackett" "Jackett.Binaries.LinuxAMDx64.tar.gz" + CLEAN_INSTALL=1 fetch_and_deploy_gh_release "jackett" "Jackett/Jackett" "prebuild" "latest" "/opt/Jackett" "Jackett.Binaries.LinuxAMDx64.tar.gz" msg_info "Starting Service" systemctl start jackett msg_ok "Started Service" - msg_ok "Updated successfully!" + msg_ok "Updated Successfully!" fi exit } diff --git a/ct/jeedom.sh b/ct/jeedom.sh index 2b933cb83..b8cf2ca3a 100644 --- a/ct/jeedom.sh +++ b/ct/jeedom.sh @@ -30,8 +30,8 @@ function update_script() { fi msg_info "Updating OS" - $STD apt-get update - $STD apt-get -y upgrade + $STD apt update + $STD apt -y upgrade msg_ok "OS updated, you can now update Jeedom from the Web UI." exit } diff --git a/ct/jenkins.sh b/ct/jenkins.sh index 38498f8f0..ed2ef063b 100644 --- a/ct/jenkins.sh +++ b/ct/jenkins.sh @@ -11,7 +11,7 @@ var_cpu="${var_cpu:-2}" var_ram="${var_ram:-1024}" var_disk="${var_disk:-4}" var_os="${var_os:-debian}" -var_version="${var_version:-12}" +var_version="${var_version:-13}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" @@ -27,11 +27,14 @@ function update_script() { msg_error "No ${APP} Installation Found!" exit fi - msg_info "Updating $APP LXC" - $STD apt-get update - $STD apt-get -y upgrade - msg_ok "Updated $APP LXC" - msg_ok "Updated successfully!" + + JAVA_VERSION="21" setup_java + + msg_info "Updating Jenkins" + $STD apt update + $STD apt -y upgrade + msg_ok "Updated Jenkins" + msg_ok "Update Successfully!" exit } diff --git a/ct/joplin-server.sh b/ct/joplin-server.sh index 39f09e269..388f9fb43 100644 --- a/ct/joplin-server.sh +++ b/ct/joplin-server.sh @@ -11,7 +11,7 @@ var_cpu="${var_cpu:-2}" var_ram="${var_ram:-4096}" var_disk="${var_disk:-20}" var_os="${var_os:-debian}" -var_version="${var_version:-12}" +var_version="${var_version:-13}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" @@ -35,18 +35,18 @@ function update_script() { fetch_and_deploy_gh_release "joplin-server" "laurent22/joplin" "tarball" "latest" - msg_info "Updating ${APP}" + msg_info "Updating Joplin-Server" cd /opt/joplin-server sed -i "/onenote-converter/d" packages/lib/package.json $STD yarn config set --home enableTelemetry 0 export BUILD_SEQUENCIAL=1 $STD yarn install --inline-builds - msg_ok "Updated ${APP}" + msg_ok "Updated Joplin-Server" msg_info "Starting Services" systemctl start joplin-server msg_ok "Started Services" - msg_ok "Updated successfully!" + msg_ok "Updated Successfully!" fi exit } diff --git a/ct/kapowarr.sh b/ct/kapowarr.sh index a80f9941f..6df0e83a2 100644 --- a/ct/kapowarr.sh +++ b/ct/kapowarr.sh @@ -11,7 +11,7 @@ var_cpu="${var_cpu:-1}" var_ram="${var_ram:-256}" var_disk="${var_disk:-2}" var_os="${var_os:-debian}" -var_version="${var_version:-12}" +var_version="${var_version:-13}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" @@ -34,7 +34,7 @@ function update_script() { if check_for_gh_release "kapowarr" "Casvt/Kapowarr"; then msg_info "Stopping Service" systemctl stop kapowarr - msg_info "Stopped Service" + msg_ok "Stopped Service" msg_info "Creating Backup" mv /opt/kapowarr/db /opt/ @@ -49,7 +49,7 @@ function update_script() { msg_info "Starting Service" systemctl start kapowarr msg_ok "Started Service" - msg_ok "Updated successfully!" + msg_ok "Updated Successfully!" fi exit } diff --git a/ct/karakeep.sh b/ct/karakeep.sh index 369327370..fe81f9bc6 100644 --- a/ct/karakeep.sh +++ b/ct/karakeep.sh @@ -11,7 +11,7 @@ var_cpu="${var_cpu:-2}" var_ram="${var_ram:-4096}" var_disk="${var_disk:-10}" var_os="${var_os:-debian}" -var_version="${var_version:-12}" +var_version="${var_version:-13}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" @@ -38,14 +38,11 @@ function update_script() { msg_ok "Updated yt-dlp" msg_info "Prepare update" - if [[ -f /opt/${APP}_version.txt && "$(cat /opt/${APP}_version.txt)" < "0.23.0" ]]; then - $STD apt-get install -y graphicsmagick ghostscript - fi + $STD apt install -y graphicsmagick ghostscript if [[ -f /opt/karakeep/.env ]] && [[ ! -f /etc/karakeep/karakeep.env ]]; then mkdir -p /etc/karakeep mv /opt/karakeep/.env /etc/karakeep/karakeep.env fi - rm -rf /opt/karakeep msg_ok "Update prepared" if grep -q "start:prod" /etc/systemd/system/karakeep-workers.service; then @@ -65,7 +62,7 @@ function update_script() { MODULE_VERSION="$(jq -r '.packageManager | split("@")[1]' /opt/karakeep/package.json)" NODE_VERSION="22" NODE_MODULE="pnpm@${MODULE_VERSION}" setup_nodejs - msg_info "Updating ${APP}" + msg_info "Updating Karakeep" corepack enable export PUPPETEER_SKIP_DOWNLOAD="true" export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD="true" @@ -86,17 +83,12 @@ function update_script() { $STD pnpm migrate $STD pnpm store prune sed -i "s/^SERVER_VERSION=.*$/SERVER_VERSION=${CHECK_UPDATE_RELEASE}/" /etc/karakeep/karakeep.env - msg_ok "Updated ${APP}" + msg_ok "Updated Karakeep" msg_info "Starting Services" systemctl start karakeep-browser karakeep-workers karakeep-web msg_ok "Started Services" - - msg_info "Cleaning up" - $STD apt-get autoremove -y - $STD apt-get autoclean -y - msg_ok "Cleaned" - msg_ok "Updated successfully!" + msg_ok "Updated Successfully!" fi exit } diff --git a/ct/kasm.sh b/ct/kasm.sh index cf5ffe0e3..d40b5cfad 100644 --- a/ct/kasm.sh +++ b/ct/kasm.sh @@ -11,7 +11,7 @@ var_cpu="${var_cpu:-2}" var_ram="${var_ram:-8192}" var_disk="${var_disk:-30}" var_os="${var_os:-debian}" -var_version="${var_version:-12}" +var_version="${var_version:-13}" var_unprivileged="${var_unprivileged:-0}" var_fuse="${var_fuse:-yes}" var_tun="${var_tun:-yes}" @@ -29,11 +29,10 @@ function update_script() { msg_error "No ${APP} Installation Found!" exit fi - msg_info "Updating $APP LXC" - $STD apt-get update - $STD apt-get -y upgrade - msg_ok "Updated $APP LXC" - msg_ok "Updated successfully!" + msg_info "Updating LXC" + $STD apt update + $STD apt -y upgrade + msg_ok "Updated LXC" exit } diff --git a/ct/keycloak.sh b/ct/keycloak.sh index b39cf93f5..a4907bab5 100644 --- a/ct/keycloak.sh +++ b/ct/keycloak.sh @@ -11,7 +11,7 @@ var_cpu="${var_cpu:-2}" var_ram="${var_ram:-2048}" var_disk="${var_disk:-4}" var_os="${var_os:-debian}" -var_version="${var_version:-12}" +var_version="${var_version:-13}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" @@ -28,9 +28,9 @@ function update_script() { exit fi if check_for_gh_release "keycloak_app" "keycloak/keycloak"; then - msg_info "Stopping Keycloak" + msg_info "Stopping Service" systemctl stop keycloak - msg_ok "Stopped Keycloak" + msg_ok "Stopped Service" msg_info "Updating packages" $STD apt-get update @@ -44,16 +44,16 @@ function update_script() { fetch_and_deploy_gh_release "keycloak_app" "keycloak/keycloak" "prebuild" "latest" "/opt/keycloak" "keycloak-*.tar.gz" - msg_info "Updating ${APP}" + msg_info "Updating Keycloak" cd /opt cp -a keycloak.old/conf/. keycloak/conf/ cp -a keycloak.old/providers/. keycloak/providers/ 2>/dev/null || true cp -a keycloak.old/themes/. keycloak/themes/ 2>/dev/null || true - msg_ok "Updated ${APP} LXC" + msg_ok "Updated Keycloak" - msg_info "Restarting Keycloak" + msg_info "Restarting Service" systemctl restart keycloak - msg_ok "Restarted Keycloak" + msg_ok "Restarted Service" msg_info "Cleaning up" rm -rf keycloak.old diff --git a/ct/kimai.sh b/ct/kimai.sh index e4860f409..f4db2b52c 100644 --- a/ct/kimai.sh +++ b/ct/kimai.sh @@ -11,7 +11,7 @@ var_cpu="${var_cpu:-2}" var_ram="${var_ram:-2048}" var_disk="${var_disk:-7}" var_os="${var_os:-debian}" -var_version="${var_version:-12}" +var_version="${var_version:-13}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" @@ -23,19 +23,18 @@ function update_script() { header_info check_container_storage check_container_resources + if ! command -v lsb_release; then + apt install -y lsb-release + fi if [[ ! -d /opt/kimai ]]; then msg_error "No ${APP} Installation Found!" exit fi - CURRENT_PHP=$(php -v 2>/dev/null | awk '/^PHP/{print $2}' | cut -d. -f1,2) - if [[ "$CURRENT_PHP" != "8.4" ]]; then - msg_info "Migrating PHP $CURRENT_PHP to 8.4" - PHP_VERSION="8.4" PHP_MODULE="gd,mysql,mbstring,bcmath,xml,curl,zip,intl,fpm" PHP_APACHE="YES" setup_php - msg_ok "Migrated PHP $CURRENT_PHP to 8.4" - fi + PHP_VERSION="8.4" PHP_MODULE="mysql" PHP_APACHE="YES" setup_php + setup_composer - if check_for_gh_release "kimai" "kimai/kimai"; then + if check_for_gh_release "kimai" "kimai/kimai"; then BACKUP_DIR="/opt/kimai_backup" msg_info "Stopping Apache2" @@ -71,8 +70,9 @@ function update_script() { chmod -R g+rw /opt/* chown -R www-data:www-data /opt/* chmod -R 777 /opt/* + rm -rf "$BACKUP_DIR" msg_ok "Setup Permissions" - msg_ok "Updated successfully!" + msg_ok "Updated Successfully!" fi exit } diff --git a/ct/koillection.sh b/ct/koillection.sh index e1aaa4bcb..c7ceae2f5 100644 --- a/ct/koillection.sh +++ b/ct/koillection.sh @@ -11,7 +11,7 @@ var_cpu="${var_cpu:-2}" var_ram="${var_ram:-1024}" var_disk="${var_disk:-8}" var_os="${var_os:-debian}" -var_version="${var_version:-12}" +var_version="${var_version:-13}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" @@ -38,7 +38,7 @@ function update_script() { fetch_and_deploy_gh_release "koillection" "benjaminjonard/koillection" - msg_info "Updating ${APP}" + msg_info "Updating Koillection" cd /opt/koillection cp -r /opt/koillection-backup/.env.local /opt/koillection cp -r /opt/koillection-backup/public/uploads/. /opt/koillection/public/uploads/ @@ -50,7 +50,7 @@ function update_script() { $STD yarn install $STD yarn build chown -R www-data:www-data /opt/koillection/public/uploads - msg_ok "Updated $APP" + msg_ok "Updated Koillection" msg_info "Starting Service" systemctl start apache2 @@ -59,7 +59,7 @@ function update_script() { msg_info "Cleaning up" rm -r /opt/koillection-backup msg_ok "Cleaned" - msg_ok "Updated successfully!" + msg_ok "Updated Successfully!" fi exit } diff --git a/ct/kometa.sh b/ct/kometa.sh index 3c6410fc4..47cb0b682 100644 --- a/ct/kometa.sh +++ b/ct/kometa.sh @@ -11,7 +11,7 @@ var_cpu="${var_cpu:-2}" var_ram="${var_ram:-4096}" var_disk="${var_disk:-8}" var_os="${var_os:-debian}" -var_version="${var_version:-12}" +var_version="${var_version:-13}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" @@ -37,7 +37,7 @@ function update_script() { cp /opt/kometa/config/config.yml /opt msg_ok "Backup completed" - PYTHON_VERSION="3.12" setup_uv + PYTHON_VERSION="3.13" setup_uv fetch_and_deploy_gh_release "kometa" "Kometa-Team/Kometa" msg_info "Updating Kometa" @@ -49,7 +49,7 @@ function update_script() { msg_info "Starting Service" systemctl start kometa msg_ok "Started Service" - msg_ok "Updated successfully!" + msg_ok "Updated Successfully!" fi exit } diff --git a/ct/komga.sh b/ct/komga.sh index 995ec104a..ba6a60281 100644 --- a/ct/komga.sh +++ b/ct/komga.sh @@ -39,7 +39,7 @@ function update_script() { msg_info "Starting Service" systemctl start komga msg_ok "Started Service" - msg_ok "Updated successfully!" + msg_ok "Updated Successfully!" fi exit } diff --git a/ct/komodo.sh b/ct/komodo.sh index f87066f8a..d3c793f51 100644 --- a/ct/komodo.sh +++ b/ct/komodo.sh @@ -11,7 +11,7 @@ var_cpu="${var_cpu:-2}" var_ram="${var_ram:-2048}" var_disk="${var_disk:-10}" var_os="${var_os:-debian}" -var_version="${var_version:-12}" +var_version="${var_version:-13}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" @@ -26,14 +26,14 @@ function update_script() { [[ -d /opt/komodo ]] || { msg_error "No ${APP} Installation Found!" - exit + exit 1 } - msg_info "Updating ${APP}" + msg_info "Updating Komodo" COMPOSE_FILE=$(find /opt/komodo -maxdepth 1 -type f -name '*.compose.yaml' ! -name 'compose.env' | head -n1) if [[ -z "$COMPOSE_FILE" ]]; then msg_error "No valid compose file found in /opt/komodo!" - exit + exit 1 fi COMPOSE_BASENAME=$(basename "$COMPOSE_FILE") @@ -42,26 +42,26 @@ function update_script() { echo -e "${YW}This configuration is no longer supported since Komodo v1.18.0.${CL}" echo -e "${YW}Please follow the migration guide:${CL}" echo -e "${BGN}https://github.com/community-scripts/ProxmoxVE/discussions/5689${CL}\n" - exit + exit 1 fi BACKUP_FILE="/opt/komodo/${COMPOSE_BASENAME}.bak_$(date +%Y%m%d_%H%M%S)" cp "$COMPOSE_FILE" "$BACKUP_FILE" || { msg_error "Failed to create backup of ${COMPOSE_BASENAME}!" - exit + exit 1 } GITHUB_URL="https://raw.githubusercontent.com/moghtech/komodo/main/compose/${COMPOSE_BASENAME}" if ! curl -fsSL "$GITHUB_URL" -o "$COMPOSE_FILE"; then msg_error "Failed to download ${COMPOSE_BASENAME} from GitHub!" mv "$BACKUP_FILE" "$COMPOSE_FILE" - exit + exit 1 fi if ! grep -qxF 'COMPOSE_KOMODO_BACKUPS_PATH=/etc/komodo/backups' /opt/komodo/compose.env; then sed -i '/^COMPOSE_KOMODO_IMAGE_TAG=latest$/a COMPOSE_KOMODO_BACKUPS_PATH=/etc/komodo/backups' /opt/komodo/compose.env fi $STD docker compose -p komodo -f "$COMPOSE_FILE" --env-file /opt/komodo/compose.env pull $STD docker compose -p komodo -f "$COMPOSE_FILE" --env-file /opt/komodo/compose.env up -d - msg_ok "Updated successfully!" + msg_ok "Updated Komodo" exit } diff --git a/ct/kubo.sh b/ct/kubo.sh index d90f4748f..35a7b0114 100644 --- a/ct/kubo.sh +++ b/ct/kubo.sh @@ -11,7 +11,7 @@ var_cpu="${var_cpu:-2}" var_ram="${var_ram:-4096}" var_disk="${var_disk:-4}" var_os="${var_os:-debian}" -var_version="${var_version:-12}" +var_version="${var_version:-13}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" diff --git a/frontend/public/json/headscale.json b/frontend/public/json/headscale.json index 4bca10f86..f2c5dd74d 100644 --- a/frontend/public/json/headscale.json +++ b/frontend/public/json/headscale.json @@ -23,7 +23,7 @@ "ram": 512, "hdd": 2, "os": "debian", - "version": "12" + "version": "13" } } ], diff --git a/frontend/public/json/healthchecks.json b/frontend/public/json/healthchecks.json index 75280844c..825e5692a 100644 --- a/frontend/public/json/healthchecks.json +++ b/frontend/public/json/healthchecks.json @@ -23,7 +23,7 @@ "ram": 2048, "hdd": 5, "os": "Debian", - "version": "12" + "version": "13" } } ], diff --git a/frontend/public/json/hivemq.json b/frontend/public/json/hivemq.json index 4ef722497..d73667e50 100644 --- a/frontend/public/json/hivemq.json +++ b/frontend/public/json/hivemq.json @@ -23,7 +23,7 @@ "ram": 1024, "hdd": 4, "os": "debian", - "version": "12" + "version": "13" } } ], diff --git a/frontend/public/json/homarr.json b/frontend/public/json/homarr.json index 48e5e3fd8..c8bcbcf7a 100644 --- a/frontend/public/json/homarr.json +++ b/frontend/public/json/homarr.json @@ -23,7 +23,7 @@ "ram": 6144, "hdd": 8, "os": "debian", - "version": "12" + "version": "13" } } ], diff --git a/frontend/public/json/homeassistant.json b/frontend/public/json/homeassistant.json index 73cded444..72fb4e132 100644 --- a/frontend/public/json/homeassistant.json +++ b/frontend/public/json/homeassistant.json @@ -1,56 +1,56 @@ { - "name": "Home Assistant Container", - "slug": "homeassistant", - "categories": [ - 16 - ], - "date_created": "2024-04-29", - "type": "ct", - "updateable": true, - "privileged": false, - "interface_port": 8123, - "documentation": "https://www.home-assistant.io/docs/", - "website": "https://www.home-assistant.io/", - "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/webp/home-assistant.webp", - "config_path": "/var/lib/docker/volumes/hass_config/_data", - "description": "A standalone container-based installation of Home Assistant Core means that the software is installed inside a Docker container, separate from the host operating system. This allows for flexibility and scalability, as well as improved security, as the container can be easily moved or isolated from other processes on the host.", - "install_methods": [ - { - "type": "default", - "script": "ct/homeassistant.sh", - "resources": { - "cpu": 2, - "ram": 2048, - "hdd": 16, - "os": "debian", - "version": "12" - } - } - ], - "default_credentials": { - "username": null, - "password": null + "name": "Home Assistant Container", + "slug": "homeassistant", + "categories": [ + 16 + ], + "date_created": "2024-04-29", + "type": "ct", + "updateable": true, + "privileged": false, + "interface_port": 8123, + "documentation": "https://www.home-assistant.io/docs/", + "website": "https://www.home-assistant.io/", + "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/webp/home-assistant.webp", + "config_path": "/var/lib/docker/volumes/hass_config/_data", + "description": "A standalone container-based installation of Home Assistant Core means that the software is installed inside a Docker container, separate from the host operating system. This allows for flexibility and scalability, as well as improved security, as the container can be easily moved or isolated from other processes on the host.", + "install_methods": [ + { + "type": "default", + "script": "ct/homeassistant.sh", + "resources": { + "cpu": 2, + "ram": 2048, + "hdd": 16, + "os": "debian", + "version": "13" + } + } + ], + "default_credentials": { + "username": null, + "password": null + }, + "notes": [ + { + "text": "Containerized version doesn't allow Home Assistant add-ons.", + "type": "warning" }, - "notes": [ - { - "text": "Containerized version doesn't allow Home Assistant add-ons.", - "type": "warning" - }, - { - "text": "If the LXC is created Privileged, the script will automatically set up USB passthrough.", - "type": "warning" - }, - { - "text": "config path: `/var/lib/docker/volumes/hass_config/_data`", - "type": "info" - }, - { - "text": "Portainer interface: $IP: 9443 - User & password must be set manually within 5 minutes, otherwise a restart of Portainer is required!", - "type": "info" - }, - { - "text": "WARNING: Installation sources scripts outside of Community Scripts repo. Please check the source before installing.", - "type": "warning" - } - ] + { + "text": "If the LXC is created Privileged, the script will automatically set up USB passthrough.", + "type": "warning" + }, + { + "text": "config path: `/var/lib/docker/volumes/hass_config/_data`", + "type": "info" + }, + { + "text": "Portainer interface: $IP: 9443 - User & password must be set manually within 5 minutes, otherwise a restart of Portainer is required!", + "type": "info" + }, + { + "text": "WARNING: Installation sources scripts outside of Community Scripts repo. Please check the source before installing.", + "type": "warning" + } + ] } diff --git a/frontend/public/json/homebox.json b/frontend/public/json/homebox.json index 795b8e452..894402cec 100644 --- a/frontend/public/json/homebox.json +++ b/frontend/public/json/homebox.json @@ -23,7 +23,7 @@ "ram": 1024, "hdd": 4, "os": "debian", - "version": "12" + "version": "13" } } ], diff --git a/frontend/public/json/homebridge.json b/frontend/public/json/homebridge.json index b0ef71887..ec5c910eb 100644 --- a/frontend/public/json/homebridge.json +++ b/frontend/public/json/homebridge.json @@ -23,7 +23,7 @@ "ram": 1024, "hdd": 4, "os": "debian", - "version": "12" + "version": "13" } } ], diff --git a/frontend/public/json/homer.json b/frontend/public/json/homer.json index debb5179d..95e6f3bcb 100644 --- a/frontend/public/json/homer.json +++ b/frontend/public/json/homer.json @@ -23,7 +23,7 @@ "ram": 512, "hdd": 2, "os": "debian", - "version": "12" + "version": "13" } } ], diff --git a/frontend/public/json/hortusfox.json b/frontend/public/json/hortusfox.json index a55ccb929..64e458cae 100644 --- a/frontend/public/json/hortusfox.json +++ b/frontend/public/json/hortusfox.json @@ -23,7 +23,7 @@ "ram": 2048, "hdd": 5, "os": "Debian", - "version": "12" + "version": "13" } } ], diff --git a/frontend/public/json/huntarr.json b/frontend/public/json/huntarr.json index 41a421f77..ad1339653 100644 --- a/frontend/public/json/huntarr.json +++ b/frontend/public/json/huntarr.json @@ -23,7 +23,7 @@ "ram": 1024, "hdd": 4, "os": "debian", - "version": "12" + "version": "13" } } ], diff --git a/frontend/public/json/hyperhdr.json b/frontend/public/json/hyperhdr.json index a45f03d1a..d3e781808 100644 --- a/frontend/public/json/hyperhdr.json +++ b/frontend/public/json/hyperhdr.json @@ -23,7 +23,7 @@ "ram": 2048, "hdd": 4, "os": "debian", - "version": "12" + "version": "13" } } ], diff --git a/frontend/public/json/hyperion.json b/frontend/public/json/hyperion.json index 1b4d9abac..642f17385 100644 --- a/frontend/public/json/hyperion.json +++ b/frontend/public/json/hyperion.json @@ -23,7 +23,7 @@ "ram": 512, "hdd": 2, "os": "debian", - "version": "12" + "version": "13" } } ], diff --git a/frontend/public/json/influxdb.json b/frontend/public/json/influxdb.json index 47139f2b3..e436b95d4 100644 --- a/frontend/public/json/influxdb.json +++ b/frontend/public/json/influxdb.json @@ -23,7 +23,7 @@ "ram": 2048, "hdd": 8, "os": "debian", - "version": "12" + "version": "13" } } ], diff --git a/frontend/public/json/inspircd.json b/frontend/public/json/inspircd.json index 2c8aad3b4..83d1650f9 100644 --- a/frontend/public/json/inspircd.json +++ b/frontend/public/json/inspircd.json @@ -22,8 +22,8 @@ "cpu": 1, "ram": 512, "hdd": 2, - "os": null, - "version": null + "os": "debian", + "version": "13" } } ], diff --git a/frontend/public/json/inventree.json b/frontend/public/json/inventree.json index c39ac4db9..57f36e001 100644 --- a/frontend/public/json/inventree.json +++ b/frontend/public/json/inventree.json @@ -23,7 +23,7 @@ "ram": 2048, "hdd": 6, "os": "debian", - "version": "12" + "version": "13" } } ], diff --git a/frontend/public/json/iobroker.json b/frontend/public/json/iobroker.json index 6249680a0..93c9cc8ba 100644 --- a/frontend/public/json/iobroker.json +++ b/frontend/public/json/iobroker.json @@ -23,7 +23,7 @@ "ram": 2048, "hdd": 8, "os": "debian", - "version": "12" + "version": "13" } } ], diff --git a/frontend/public/json/itsm-ng.json b/frontend/public/json/itsm-ng.json index 89a7c62d7..a41887795 100644 --- a/frontend/public/json/itsm-ng.json +++ b/frontend/public/json/itsm-ng.json @@ -23,7 +23,7 @@ "ram": 2048, "hdd": 10, "os": "debian", - "version": "12" + "version": "13" } } ], diff --git a/frontend/public/json/iventoy.json b/frontend/public/json/iventoy.json index ce62e43cb..3d8ef3b2f 100644 --- a/frontend/public/json/iventoy.json +++ b/frontend/public/json/iventoy.json @@ -23,7 +23,7 @@ "ram": 512, "hdd": 2, "os": "debian", - "version": "12" + "version": "13" } } ], diff --git a/frontend/public/json/jackett.json b/frontend/public/json/jackett.json index 6ee1016c1..7277f1835 100644 --- a/frontend/public/json/jackett.json +++ b/frontend/public/json/jackett.json @@ -23,7 +23,7 @@ "ram": 512, "hdd": 2, "os": "debian", - "version": "12" + "version": "13" } } ], diff --git a/frontend/public/json/jenkins.json b/frontend/public/json/jenkins.json index b31c75376..3da72c1eb 100644 --- a/frontend/public/json/jenkins.json +++ b/frontend/public/json/jenkins.json @@ -23,7 +23,7 @@ "ram": 1024, "hdd": 4, "os": "debian", - "version": "12" + "version": "13" } } ], diff --git a/frontend/public/json/joplin-server.json b/frontend/public/json/joplin-server.json index 10df5731d..2af485d15 100644 --- a/frontend/public/json/joplin-server.json +++ b/frontend/public/json/joplin-server.json @@ -23,7 +23,7 @@ "ram": 4096, "hdd": 20, "os": "Debian", - "version": "12" + "version": "13" } } ], diff --git a/frontend/public/json/kapowarr.json b/frontend/public/json/kapowarr.json index 6468f1eac..4b8ccbb2f 100644 --- a/frontend/public/json/kapowarr.json +++ b/frontend/public/json/kapowarr.json @@ -23,7 +23,7 @@ "ram": 256, "hdd": 2, "os": "debian", - "version": "12" + "version": "13" } } ], diff --git a/frontend/public/json/karakeep.json b/frontend/public/json/karakeep.json index 16844c829..5c12eed48 100644 --- a/frontend/public/json/karakeep.json +++ b/frontend/public/json/karakeep.json @@ -23,7 +23,7 @@ "ram": 4096, "hdd": 10, "os": "debian", - "version": "12" + "version": "13" } } ], diff --git a/frontend/public/json/kasm.json b/frontend/public/json/kasm.json index e4f27383f..3b09acad5 100644 --- a/frontend/public/json/kasm.json +++ b/frontend/public/json/kasm.json @@ -23,7 +23,7 @@ "ram": 8192, "hdd": 50, "os": "Debian", - "version": "12" + "version": "13" } } ], diff --git a/frontend/public/json/keycloak.json b/frontend/public/json/keycloak.json index 2f86a46e6..075b066b8 100644 --- a/frontend/public/json/keycloak.json +++ b/frontend/public/json/keycloak.json @@ -23,7 +23,7 @@ "ram": 2048, "hdd": 4, "os": "debian", - "version": "12" + "version": "13" } } ], diff --git a/frontend/public/json/kimai.json b/frontend/public/json/kimai.json index 21f36923e..c3fd2183c 100644 --- a/frontend/public/json/kimai.json +++ b/frontend/public/json/kimai.json @@ -23,7 +23,7 @@ "ram": 2048, "hdd": 7, "os": "debian", - "version": "12" + "version": "13" } } ], diff --git a/frontend/public/json/koillection.json b/frontend/public/json/koillection.json index 7693bda09..48871464d 100644 --- a/frontend/public/json/koillection.json +++ b/frontend/public/json/koillection.json @@ -23,7 +23,7 @@ "ram": 1024, "hdd": 8, "os": "debian", - "version": "12" + "version": "13" } } ], diff --git a/frontend/public/json/kometa.json b/frontend/public/json/kometa.json index 9d5c7346e..0426af19e 100644 --- a/frontend/public/json/kometa.json +++ b/frontend/public/json/kometa.json @@ -23,7 +23,7 @@ "ram": 4096, "hdd": 8, "os": "debian", - "version": "12" + "version": "13" } } ], diff --git a/frontend/public/json/komodo.json b/frontend/public/json/komodo.json index 569e0910d..6cd43943a 100644 --- a/frontend/public/json/komodo.json +++ b/frontend/public/json/komodo.json @@ -23,7 +23,7 @@ "ram": 2048, "hdd": 10, "os": "debian", - "version": "12" + "version": "13" } }, { diff --git a/frontend/public/json/kubo.json b/frontend/public/json/kubo.json index 2ee9705f2..355d7fb58 100644 --- a/frontend/public/json/kubo.json +++ b/frontend/public/json/kubo.json @@ -23,7 +23,7 @@ "ram": 4096, "hdd": 4, "os": "debian", - "version": "12" + "version": "13" } } ], diff --git a/install/habitica-install.sh b/install/habitica-install.sh index 45a38ee4f..237d860a0 100644 --- a/install/habitica-install.sh +++ b/install/habitica-install.sh @@ -14,7 +14,7 @@ network_check update_os msg_info "Installing Dependencies" -$STD apt-get install -y \ +$STD apt install -y \ libkrb5-dev \ build-essential \ git @@ -90,8 +90,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/headscale-install.sh b/install/headscale-install.sh index 770a83a9e..e3baad93c 100644 --- a/install/headscale-install.sh +++ b/install/headscale-install.sh @@ -18,9 +18,9 @@ fetch_and_deploy_gh_release "headscale" "juanfont/headscale" "binary" read -r -p "${TAB3}Would you like to add headscale-admin UI? " prompt if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then fetch_and_deploy_gh_release "headscale-admin" "GoodiesHQ/headscale-admin" "prebuild" "latest" "/opt/headscale-admin" "admin.zip" - + msg_info "Configuring headscale-admin" - $STD apt-get install -y caddy + $STD apt install -y caddy $STD caddy stop rm /etc/caddy/Caddyfile cat <<'EOF' >/etc/caddy/Caddyfile @@ -56,8 +56,4 @@ msg_ok "Service started" motd_ssh customize - -msg_info "Cleaning up" -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/healthchecks-install.sh b/install/healthchecks-install.sh index ece460442..4bd63a353 100644 --- a/install/healthchecks-install.sh +++ b/install/healthchecks-install.sh @@ -14,7 +14,7 @@ network_check update_os msg_info "Installing Dependencies" -$STD apt-get install -y \ +$STD apt install -y \ gcc \ libpq-dev \ libcurl4-openssl-dev \ @@ -22,7 +22,7 @@ $STD apt-get install -y \ caddy msg_ok "Installed Dependencies" -setup_uv +PYTHON_VERSION="3.12" setup_python PG_VERSION=16 setup_postgresql msg_info "Setup Database" @@ -32,7 +32,6 @@ DB_PASS=$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | cut -c1-13) SECRET_KEY="$(openssl rand -base64 32 | tr -dc 'a-zA-Z0-9' | cut -c1-32)" ADMIN_EMAIL="admin@helper-scripts.local" ADMIN_PASSWORD="$DB_PASS" - $STD sudo -u postgres psql -c "CREATE ROLE $DB_USER WITH LOGIN PASSWORD '$DB_PASS';" $STD sudo -u postgres psql -c "CREATE DATABASE $DB_NAME WITH OWNER $DB_USER ENCODING 'UTF8' TEMPLATE template0;" $STD sudo -u postgres psql -c "ALTER ROLE $DB_USER SET client_encoding TO 'utf8';" @@ -129,8 +128,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/hivemq-install.sh b/install/hivemq-install.sh index 273b5a666..fb4677332 100644 --- a/install/hivemq-install.sh +++ b/install/hivemq-install.sh @@ -31,8 +31,4 @@ msg_ok "Service started" motd_ssh customize - -msg_info "Cleaning up" -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/homarr-install.sh b/install/homarr-install.sh index 4afa5f585..195c78cf7 100644 --- a/install/homarr-install.sh +++ b/install/homarr-install.sh @@ -14,7 +14,7 @@ network_check update_os msg_info "Installing Dependencies" -$STD apt-get install -y \ +$STD apt install -y \ redis-server \ ca-certificates \ make \ @@ -112,8 +112,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/homeassistant-install.sh b/install/homeassistant-install.sh index e041e72fc..39a00eda2 100644 --- a/install/homeassistant-install.sh +++ b/install/homeassistant-install.sh @@ -14,7 +14,7 @@ network_check update_os msg_info "Setup Python3" -$STD apt-get install -y \ +$STD apt install -y \ python3 \ python3-dev \ python3-pip \ @@ -78,8 +78,4 @@ msg_ok "Installed Home Assistant $CORE_LATEST_VERSION" motd_ssh customize - -msg_info "Cleaning up" -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/homebox-install.sh b/install/homebox-install.sh index 3cc60813f..f70aaed77 100644 --- a/install/homebox-install.sh +++ b/install/homebox-install.sh @@ -46,8 +46,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/homebridge-install.sh b/install/homebridge-install.sh index 42fe01b1d..d76b033f2 100644 --- a/install/homebridge-install.sh +++ b/install/homebridge-install.sh @@ -14,23 +14,21 @@ network_check update_os msg_info "Installing Dependencies" -$STD apt-get install -y avahi-daemon +$STD apt install -y avahi-daemon msg_ok "Installed Dependencies" msg_info "Setting up Homebridge Repository" -curl -fsSL https://repo.homebridge.io/KEY.gpg | gpg --dearmor >/etc/apt/trusted.gpg.d/homebridge.gpg -echo 'deb [signed-by=/etc/apt/trusted.gpg.d/homebridge.gpg] https://repo.homebridge.io stable main' >/etc/apt/sources.list.d/homebridge.list +setup_deb822_repo \ + "homebridge" \ + "https://repo.homebridge.io/KEY.gpg" \ + "https://repo.homebridge.io" \ + "stable" msg_ok "Set up Homebridge Repository" msg_info "Installing Homebridge" -$STD apt update -$STD apt-get install -y homebridge +$STD apt install -y homebridge msg_ok "Installed Homebridge" motd_ssh customize - -msg_info "Cleaning up" -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/hortusfox-install.sh b/install/hortusfox-install.sh index c727c78bb..2d167b96e 100644 --- a/install/hortusfox-install.sh +++ b/install/hortusfox-install.sh @@ -14,11 +14,11 @@ network_check update_os msg_info "Installing Dependencies" -$STD apt-get install -y apache2 +$STD apt install -y apache2 msg_ok "Installed Dependencies" -PHP_MODULE="exif,mysql" PHP_APACHE="YES" PHP_FPM="NO" PHP_VERSION="8.3" setup_php setup_mariadb +PHP_MODULE="exif,mysql" PHP_APACHE="YES" PHP_FPM="NO" PHP_VERSION="8.3" setup_php setup_composer msg_info "Setting up database" @@ -97,8 +97,4 @@ msg_ok "Apache configured" motd_ssh customize - -msg_info "Cleaning up" -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/huntarr-install.sh b/install/huntarr-install.sh index 668ee870b..98073ef7b 100644 --- a/install/huntarr-install.sh +++ b/install/huntarr-install.sh @@ -13,10 +13,6 @@ setting_up_container network_check update_os -msg_info "Installing Dependencies" -$STD apt-get install -y jq -msg_ok "Installed Dependencies" - setup_uv fetch_and_deploy_gh_release "huntarr" "plexguide/Huntarr.io" @@ -42,8 +38,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/hyperhdr-install.sh b/install/hyperhdr-install.sh index b83d31813..79235f754 100644 --- a/install/hyperhdr-install.sh +++ b/install/hyperhdr-install.sh @@ -14,11 +14,12 @@ network_check update_os msg_info "Installing HyperHDR" -curl -fsSL https://awawa-dev.github.io/hyperhdr.public.apt.gpg.key >/usr/share/keyrings/hyperhdr.public.apt.gpg.key -chmod go+r /usr/share/keyrings/hyperhdr.public.apt.gpg.key -echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/hyperhdr.public.apt.gpg.key] https://awawa-dev.github.io $(awk -F= '/VERSION_CODENAME/ {print $2}' /etc/os-release) main" >/etc/apt/sources.list.d/hyperhdr.list -$STD apt-get update -$STD apt-get install -y hyperhdr +setup_deb822_repo \ + "hyperhdr" \ + "https://awawa-dev.github.io/hyperhdr.public.apt.gpg.key" \ + "https://awawa-dev.github.io" \ + "$(get_os_info codename)" +$STD apt install -y hyperhdr msg_ok "Installed HyperHDR" msg_info "Creating Service" @@ -41,8 +42,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/hyperion-install.sh b/install/hyperion-install.sh index 4663c1515..946354898 100644 --- a/install/hyperion-install.sh +++ b/install/hyperion-install.sh @@ -13,25 +13,19 @@ setting_up_container network_check update_os -msg_info "Installing Dependencies" -$STD apt-get install -y lsb-release -$STD apt-get install -y apt-transport-https -$STD apt-get install -y libpython3.11 - -msg_ok "Installed Dependencies" +msg_info "Setting up Hyperion repository" +setup_deb822_repo \ + "hyperion" \ + "https://releases.hyperion-project.org/hyperion.pub.key" \ + "https://apt.releases.hyperion-project.org" \ + "$(get_os_info codename)" +msg_ok "Set up Hyperion repository" msg_info "Installing Hyperion" -curl -fsSL "https://releases.hyperion-project.org/hyperion.pub.key" | gpg --dearmor -o /usr/share/keyrings/hyperion.pub.gpg -echo "deb [signed-by=/usr/share/keyrings/hyperion.pub.gpg] https://apt.releases.hyperion-project.org/ $(lsb_release -cs) main" >/etc/apt/sources.list.d/hyperion.list -$STD apt-get update -$STD apt-get install -y hyperion -$STD systemctl enable --now hyperion@root +$STD apt install -y hyperion +systemctl enable -q --now hyperion@root msg_ok "Installed Hyperion" motd_ssh customize - -msg_info "Cleaning up" -$STD apt-get autoremove >/dev/null -$STD apt-get autoclean >/dev/null -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/immich-install.sh b/install/immich-install.sh index a4551f4c3..3ca1ee743 100644 --- a/install/immich-install.sh +++ b/install/immich-install.sh @@ -16,8 +16,7 @@ update_os setup_uv msg_info "Installing dependencies" -$STD apt-get update -$STD apt-get install --no-install-recommends -y \ +$STD apt install --no-install-recommends -y \ git \ redis \ autoconf \ @@ -66,21 +65,16 @@ $STD apt-get install --no-install-recommends -y \ libwebp-dev \ libaom-dev \ ccache -curl -fsSL https://repo.jellyfin.org/jellyfin_team.gpg.key | gpg --dearmor -o /etc/apt/keyrings/jellyfin.gpg -DPKG_ARCHITECTURE="$(dpkg --print-architecture)" -export DPKG_ARCHITECTURE -cat </etc/apt/sources.list.d/jellyfin.sources -Types: deb -URIs: https://repo.jellyfin.org/debian -Suites: trixie -Components: main -Architectures: ${DPKG_ARCHITECTURE} -Signed-By: /etc/apt/keyrings/jellyfin.gpg -EOF -$STD apt-get update -$STD apt-get install -y jellyfin-ffmpeg7 -ln -s /usr/lib/jellyfin-ffmpeg/ffmpeg /usr/bin/ffmpeg -ln -s /usr/lib/jellyfin-ffmpeg/ffprobe /usr/bin/ffprobe + +setup_deb822_repo \ + "jellyfin" \ + "https://repo.jellyfin.org/jellyfin_team.gpg.key" \ + "https://repo.jellyfin.org/debian" \ + "$(get_os_info codename)" +$STD apt install -y jellyfin-ffmpeg7 +ln -sf /usr/lib/jellyfin-ffmpeg/ffmpeg /usr/bin/ffmpeg +ln -sf /usr/lib/jellyfin-ffmpeg/ffprobe /usr/bin/ffprobe + if [[ "$CTTYPE" == "0" && -d /dev/dri ]]; then chgrp video /dev/dri chmod 755 /dev/dri @@ -94,7 +88,7 @@ read -r -p "${TAB3}Install OpenVINO dependencies for Intel HW-accelerated machin if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then msg_info "Installing OpenVINO dependencies" touch ~/.openvino - $STD apt-get install -y --no-install-recommends patchelf + $STD apt install -y --no-install-recommends patchelf tmp_dir=$(mktemp -d) $STD pushd "$tmp_dir" curl -fsSLO https://github.com/intel/intel-graphics-compiler/releases/download/igc-1.0.17384.11/intel-igc-core_1.0.17384.11_amd64.deb @@ -120,10 +114,10 @@ Package: * Pin:release a=testing Pin-Priority: 450 EOF -$STD apt-get update +$STD apt update msg_ok "Configured Debian Testing repo" msg_info "Installing libmimalloc3" -$STD apt-get install -t testing --no-install-recommends -yqq libmimalloc3 +$STD apt install -t testing --no-install-recommends -yqq libmimalloc3 msg_ok "Installed libmimalloc3" PNPM_VERSION="$(curl -fsSL "https://raw.githubusercontent.com/immich-app/immich/refs/heads/main/package.json" | jq -r '.packageManager | split("@")[1]')" @@ -460,9 +454,4 @@ msg_ok "Modified user, created env file, scripts and services" motd_ssh customize - -msg_info "Cleaning up" -$STD apt-get -y autoremove -$STD apt-get -y autoclean -$STD apt clean -y -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/influxdb-install.sh b/install/influxdb-install.sh index f19b13a37..97d0951bb 100644 --- a/install/influxdb-install.sh +++ b/install/influxdb-install.sh @@ -13,14 +13,12 @@ setting_up_container network_check update_os -msg_info "Installing Dependencies" -$STD apt-get install -y lsb-base -$STD apt-get install -y lsb-release -msg_ok "Installed Dependencies" - msg_info "Setting up InfluxDB Repository" -curl -fsSL "https://repos.influxdata.com/influxdata-archive_compat.key" | gpg --dearmor >/etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg -echo "deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg] https://repos.influxdata.com/debian stable main" >/etc/apt/sources.list.d/influxdata.list +setup_deb822_repo \ + "influxdata" \ + "https://repos.influxdata.com/influxdata-archive_compat.key" \ + "https://repos.influxdata.com/$(get_os_info id)" \ + "stable" msg_ok "Set up InfluxDB Repository" read -r -p "${TAB3}Which version of InfluxDB to install? (1 or 2) " prompt @@ -31,13 +29,14 @@ else fi msg_info "Installing InfluxDB" -$STD apt-get update +$STD apt update if [[ $INFLUX == "2" ]]; then - $STD apt-get install -y influxdb2 + $STD apt install -y influxdb2 else - $STD apt-get install -y influxdb - curl -fsSL "https://dl.influxdata.com/chronograf/releases/chronograf_1.10.7_amd64.deb" -o "/chronograf_1.10.7_amd64.deb" - $STD dpkg -i chronograf_1.10.7_amd64.deb + $STD apt install -y influxdb + curl -fsSL "https://dl.influxdata.com/chronograf/releases/chronograf_1.10.8_amd64.deb" -o "/chronograf_1.10.8_amd64.deb" + $STD dpkg -i chronograf_1.10.8_amd64.deb + rm -rf /chronograf_1.10.8_amd64.deb fi $STD systemctl enable --now influxdb msg_ok "Installed InfluxDB" @@ -45,14 +44,10 @@ msg_ok "Installed InfluxDB" read -r -p "${TAB3}Would you like to add Telegraf? " prompt if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then msg_info "Installing Telegraf" - $STD apt-get install -y telegraf + $STD apt install -y telegraf msg_ok "Installed Telegraf" fi motd_ssh customize - -msg_info "Cleaning up" -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/inspircd-install.sh b/install/inspircd-install.sh index 502f88e58..c9e236427 100644 --- a/install/inspircd-install.sh +++ b/install/inspircd-install.sh @@ -34,8 +34,4 @@ msg_ok "Installed InspIRCd" motd_ssh customize - -msg_info "Cleaning up" -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/iobroker-install.sh b/install/iobroker-install.sh index 1bc1acb73..d873d9916 100644 --- a/install/iobroker-install.sh +++ b/install/iobroker-install.sh @@ -14,7 +14,7 @@ network_check update_os msg_info "Installing Dependencies" -$STD apt-get install -y ca-certificates +$STD apt install -y ca-certificates msg_ok "Installed Dependencies" msg_warn "WARNING: This script will run an external installer from a third-party source (https://iobroker.net/)." @@ -36,8 +36,4 @@ msg_ok "Installed ioBroker" motd_ssh customize - -msg_info "Cleaning up" -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/itsm-ng-install.sh b/install/itsm-ng-install.sh index 4f9697e12..0fd851df8 100644 --- a/install/itsm-ng-install.sh +++ b/install/itsm-ng-install.sh @@ -33,9 +33,11 @@ mariadb -u root -e "GRANT SELECT ON \`mysql\`.\`time_zone_name\` TO '$DB_USER'@' msg_ok "Set up database" msg_info "Setup ITSM-NG Repository" -curl -fsSL http://deb.itsm-ng.org/pubkey.gpg | gpg --dearmor -o /etc/apt/trusted.gpg.d/itsm-ng-keyring.gpg -echo "deb http://deb.itsm-ng.org/$(. /etc/os-release && echo "$ID")/ $(. /etc/os-release && echo "$VERSION_CODENAME") main" >/etc/apt/sources.list.d/itsm-ng.list -$STD apt-get update +setup_deb822_repo \ + "itsm-ng" \ + "http://deb.itsm-ng.org/pubkey.gpg" \ + "http://deb.itsm-ng.org/$(get_os_info id)/" \ + "$(get_os_info codename)" msg_ok "Setup ITSM-NG Repository" msg_info "Installing ITSM-NG" @@ -56,13 +58,9 @@ sed -i 's/^[;]*max_input_vars *=.*/max_input_vars = 5000/' "$PHP_INI" sed -i 's/^memory_limit = .*/memory_limit = 256M/' $PHP_INI sed -i 's/^;\?\s*session.cookie_httponly\s*=.*/session.cookie_httponly = On/' $PHP_INI systemctl restart apache2 +rm -rf /usr/share/itsm-ng/install msg_ok "Configured PHP" motd_ssh customize - -msg_info "Cleaning up" -rm -rf /usr/share/itsm-ng/install -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/jackett-install.sh b/install/jackett-install.sh index 7ef45bcc9..93f1997b8 100644 --- a/install/jackett-install.sh +++ b/install/jackett-install.sh @@ -39,8 +39,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/jeedom-install.sh b/install/jeedom-install.sh index b0bd78b06..6ffdce013 100644 --- a/install/jeedom-install.sh +++ b/install/jeedom-install.sh @@ -14,7 +14,7 @@ network_check update_os msg_info "Installing dependencies" -$STD apt-get install -y \ +$STD apt install -y \ lsb-release \ git msg_ok "Dependencies installed" @@ -98,8 +98,5 @@ msg_ok "Installation checked, everything is successfuly installed. A reboot is r motd_ssh customize -msg_info "Cleaning up" rm -rf /tmp/install.sh -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/jellyfin-install.sh b/install/jellyfin-install.sh index d33573448..0c971d3cc 100644 --- a/install/jellyfin-install.sh +++ b/install/jellyfin-install.sh @@ -70,9 +70,4 @@ msg_ok "Installed Jellyfin" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/jenkins-install.sh b/install/jenkins-install.sh index f7e980729..11a7db6a7 100644 --- a/install/jenkins-install.sh +++ b/install/jenkins-install.sh @@ -12,21 +12,15 @@ setting_up_container network_check update_os -msg_info "Installing Dependencies" -$STD apt-get install -y openjdk-17-jre -msg_ok "Installed Dependencies" +JAVA_VERSION="21" setup_java msg_info "Setup Jenkins" curl -fsSL "https://pkg.jenkins.io/debian/jenkins.io-2023.key" -o "/usr/share/keyrings/jenkins-keyring.asc" echo "deb [signed-by=/usr/share/keyrings/jenkins-keyring.asc]" https://pkg.jenkins.io/debian binary/ >/etc/apt/sources.list.d/jenkins.list -$STD apt-get update -$STD apt-get install -y jenkins +$STD apt update +$STD apt install -y jenkins msg_ok "Setup Jenkins" motd_ssh customize - -msg_info "Cleaning up" -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/joplin-server-install.sh b/install/joplin-server-install.sh index 1abe51095..1f88b69e0 100644 --- a/install/joplin-server-install.sh +++ b/install/joplin-server-install.sh @@ -14,13 +14,13 @@ network_check update_os msg_info "Installing Dependencies" -$STD apt-get install -y \ +$STD apt install -y \ git \ rsync msg_ok "Installed Dependencies" PG_VERSION="17" setup_postgresql -NODE_VERSION=22 NODE_MODULE="yarn@latest,npm@latest,pm2@latest" setup_nodejs +NODE_VERSION=22 NODE_MODULE="yarn,npm,pm2" setup_nodejs mkdir -p /opt/pm2 export PM2_HOME=/opt/pm2 $STD pm2 install pm2-logrotate @@ -91,8 +91,4 @@ msg_ok "Service Setup" motd_ssh customize - -msg_info "Cleaning up" -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/jotty-install.sh b/install/jotty-install.sh index d20896c36..7eb82583f 100644 --- a/install/jotty-install.sh +++ b/install/jotty-install.sh @@ -66,9 +66,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/jupyternotebook-install.sh b/install/jupyternotebook-install.sh index a9a2eca8f..b0e5edc67 100644 --- a/install/jupyternotebook-install.sh +++ b/install/jupyternotebook-install.sh @@ -48,8 +48,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/kapowarr-install.sh b/install/kapowarr-install.sh index c5f29a7b3..f3bc79641 100644 --- a/install/kapowarr-install.sh +++ b/install/kapowarr-install.sh @@ -13,11 +13,11 @@ setting_up_container network_check update_os -msg_info "Setup Python3" -$STD apt-get install -y python3-pip -msg_ok "Setup Python3" +msg_info "Installing Dependencies" +$STD apt install -y python3-pip +msg_ok "Installed Dependencies" -setup_uv +PYTHON_VERSION="3.12" setup_uv fetch_and_deploy_gh_release "kapowarr" "Casvt/Kapowarr" msg_info "Setup Kapowarr" @@ -47,8 +47,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/karakeep-install.sh b/install/karakeep-install.sh index 2e86eb95f..4fa9041a0 100644 --- a/install/karakeep-install.sh +++ b/install/karakeep-install.sh @@ -14,7 +14,7 @@ network_check update_os msg_info "Installing Dependencies" -$STD apt-get install -y \ +$STD apt install -y \ build-essential \ ca-certificates \ chromium \ @@ -173,8 +173,4 @@ msg_ok "Created Services" motd_ssh customize - -msg_info "Cleaning up" -$STD apt-get autoremove -y -$STD apt-get autoclean -y -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/kasm-install.sh b/install/kasm-install.sh index bfdf1a731..6a52c0285 100644 --- a/install/kasm-install.sh +++ b/install/kasm-install.sh @@ -43,10 +43,6 @@ msg_ok "Installed Kasm Workspaces" motd_ssh customize - -msg_info "Cleaning up" rm -f /opt/kasm_release_${KASM_VERSION}.tar.gz rm -f ~/kasm-install.output -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/kavita-install.sh b/install/kavita-install.sh index 985140eb7..331cf174b 100644 --- a/install/kavita-install.sh +++ b/install/kavita-install.sh @@ -38,9 +38,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt -y autoremove -$STD apt -y autoclean -$STD apt -y clean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/keycloak-install.sh b/install/keycloak-install.sh index 9130fd6bd..2328cafd7 100644 --- a/install/keycloak-install.sh +++ b/install/keycloak-install.sh @@ -61,8 +61,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/kimai-install.sh b/install/kimai-install.sh index 34011e2b0..83497ebbc 100644 --- a/install/kimai-install.sh +++ b/install/kimai-install.sh @@ -14,7 +14,7 @@ network_check update_os msg_info "Installing Dependencies" -$STD apt-get install -y \ +$STD apt install -y \ apt-transport-https \ apache2 \ git \ @@ -22,7 +22,7 @@ $STD apt-get install -y \ msg_ok "Installed Dependencies" setup_mariadb -PHP_VERSION="8.4" PHP_MODULE="gd,mysql,mbstring,bcmath,xml,curl,zip,intl" PHP_APACHE="YES" setup_php +PHP_VERSION="8.4" PHP_MODULE="mysql" PHP_APACHE="YES" setup_php setup_composer msg_info "Setting up database" @@ -30,10 +30,9 @@ DB_NAME=kimai_db DB_USER=kimai DB_PASS=$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | head -c13) MYSQL_VERSION=$(mariadb --version | grep -oE '[0-9]+\.[0-9]+\.[0-9]+') -$STD mariadb -u root -e "CREATE DATABASE $DB_NAME;" -$STD mariadb -u root -e "CREATE USER '$DB_USER'@'localhost' IDENTIFIED BY '$DB_PASS';" -$STD mariadb -u root -e "GRANT ALL ON $DB_NAME.* TO '$DB_USER'@'localhost'; FLUSH PRIVILEGES;" -$STD mariadb -u root -e "SET GLOBAL sql_mode='';" +$STD mariadb -e "CREATE DATABASE $DB_NAME;" +$STD mariadb -e "CREATE USER '$DB_USER'@'localhost' IDENTIFIED BY '$DB_PASS';" +$STD mariadb -e "GRANT ALL ON $DB_NAME.* TO '$DB_USER'@'localhost'; FLUSH PRIVILEGES;" { echo "Kimai-Credentials" echo "Kimai Database User: $DB_USER" @@ -44,13 +43,13 @@ msg_ok "Set up database" fetch_and_deploy_gh_release "kimai" "kimai/kimai" -msg_info "Installing Kimai" +msg_info "Setup Kimai" cd /opt/kimai echo "export COMPOSER_ALLOW_SUPERUSER=1" >>~/.bashrc source ~/.bashrc $STD composer install --no-dev --optimize-autoloader --no-interaction cp .env.dist .env -sed -i "/^DATABASE_URL=/c\DATABASE_URL=mysql://$DB_USER:$DB_PASS@127.0.0.1:3306/$DB_NAME?charset=utf8mb4&serverVersion=mariadb-$MYSQL_VERSION" /opt/kimai/.env +sed -i "/^DATABASE_URL=/c\DATABASE_URL=mysql://$DB_USER:$DB_PASS@127.0.0.1:3306/$DB_NAME?charset=utf8mb4&serverVersion=$MYSQL_VERSION" /opt/kimai/.env $STD bin/console kimai:install -n $STD expect </dev/null -$STD apt-get update +setup_deb822_repo \ + "docker" \ + "https://download.docker.com/linux/$(get_os_info id)/gpg" \ + "https://download.docker.com/linux/$(get_os_info id)" \ + "$(get_os_info codename)" \ + "stable" \ + "$(dpkg --print-architecture)" msg_ok "Setup Docker Repository" msg_info "Installing Docker" -$STD apt-get install -y \ +$STD apt install -y \ docker-ce \ docker-ce-cli \ containerd.io \ @@ -87,8 +82,4 @@ msg_ok "Initialized Komodo" motd_ssh customize - -msg_info "Cleaning up" -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/install/kubo-install.sh b/install/kubo-install.sh index ad5ef8b28..6ccb52d8a 100644 --- a/install/kubo-install.sh +++ b/install/kubo-install.sh @@ -45,8 +45,4 @@ msg_ok "Created Service" motd_ssh customize - -msg_info "Cleaning up" -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" +cleanup_lxc diff --git a/misc/build.func b/misc/build.func index dd7d87f4f..1f3ff1fab 100644 --- a/misc/build.func +++ b/misc/build.func @@ -1078,6 +1078,7 @@ start() { ;; esac update_script + cleanup_lxc fi }