From 965b8cb33ee386bb15399b1ff68fd8548e5e4535 Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Sun, 5 Oct 2025 22:28:23 +0200 Subject: [PATCH] adventurelog: bump to debian 13 (#8125) --- ct/adventurelog.sh | 12 ++++++------ frontend/public/json/adventurelog.json | 2 +- install/adventurelog-install.sh | 17 +++++++++-------- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/ct/adventurelog.sh b/ct/adventurelog.sh index 42e08b105..65e48a0ca 100644 --- a/ct/adventurelog.sh +++ b/ct/adventurelog.sh @@ -11,7 +11,7 @@ var_disk="${var_disk:-7}" var_cpu="${var_cpu:-2}" var_ram="${var_ram:-2048}" 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 if ! command -v memcached >/dev/null 2>&1; then - $STD apt-get update - $STD apt-get install -y memcached libmemcached-tools + $STD apt update + $STD apt install -y memcached libmemcached-tools fi if check_for_gh_release "adventurelog" "seanmorley15/adventurelog"; then msg_info "Stopping Services" @@ -43,12 +43,12 @@ function update_script() { msg_ok "Backup done" fetch_and_deploy_gh_release "adventurelog" "seanmorley15/adventurelog" - PYTHON_VERSION="3.12" setup_uv + PYTHON_VERSION="3.13" setup_uv msg_info "Updating ${APP}" cp /opt/adventurelog-backup/backend/server/.env /opt/adventurelog/backend/server/.env cp -r /opt/adventurelog-backup/backend/server/media /opt/adventurelog/backend/server/media - cd /opt/adventurelog/backend/server + cd /opt/adventurelog/backend/server || exit if [[ ! -x .venv/bin/python ]]; then $STD uv venv .venv $STD .venv/bin/python -m ensurepip --upgrade @@ -59,7 +59,7 @@ function update_script() { $STD .venv/bin/python -m manage migrate cp /opt/adventurelog-backup/frontend/.env /opt/adventurelog/frontend/.env - cd /opt/adventurelog/frontend + cd /opt/adventurelog/frontend || exit $STD pnpm i $STD pnpm build msg_ok "Updated ${APP}" diff --git a/frontend/public/json/adventurelog.json b/frontend/public/json/adventurelog.json index 5502eb0e5..a9cc1ff38 100644 --- a/frontend/public/json/adventurelog.json +++ b/frontend/public/json/adventurelog.json @@ -23,7 +23,7 @@ "ram": 2048, "hdd": 7, "os": "debian", - "version": "12" + "version": "13" } } ], diff --git a/install/adventurelog-install.sh b/install/adventurelog-install.sh index 4f51e367b..f53021af7 100644 --- a/install/adventurelog-install.sh +++ b/install/adventurelog-install.sh @@ -14,7 +14,7 @@ network_check update_os msg_info "Installing Dependencies" -$STD apt-get install -y \ +$STD apt install -y \ gdal-bin \ libgdal-dev \ git \ @@ -22,9 +22,9 @@ $STD apt-get install -y \ libmemcached-tools msg_ok "Installed Dependencies" -PYTHON_VERSION="3.12" setup_uv +PYTHON_VERSION="3.13" setup_uv NODE_VERSION="22" NODE_MODULE="pnpm@latest" setup_nodejs -PG_VERSION="16" PG_MODULES="postgis" setup_postgresql +PG_VERSION="17" PG_MODULES="postgis" setup_postgresql msg_info "Set up PostgreSQL Database" DB_NAME="adventurelog_db" @@ -74,7 +74,7 @@ DISABLE_REGISTRATION=False # EMAIL_HOST_PASSWORD='password' # DEFAULT_FROM_EMAIL='user@example.com' EOF -cd /opt/adventurelog/backend/server +cd /opt/adventurelog/backend/server || exit mkdir -p /opt/adventurelog/backend/server/media $STD uv venv /opt/adventurelog/backend/server/.venv $STD /opt/adventurelog/backend/server/.venv/bin/python -m ensurepip --upgrade @@ -88,13 +88,13 @@ PUBLIC_SERVER_URL=http://$LOCAL_IP:8000 BODY_SIZE_LIMIT=Infinity ORIGIN='http://$LOCAL_IP:3000' EOF -cd /opt/adventurelog/frontend +cd /opt/adventurelog/frontend || exit $STD pnpm i $STD pnpm build msg_ok "Installed AdventureLog" msg_info "Setting up Django Admin" -cd /opt/adventurelog/backend/server +cd /opt/adventurelog/backend/server || exit $STD .venv/bin/python -m manage shell <