From 56a82a2b3ae8fb31fad1176eea86c8a1a7af9930 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 18 Dec 2024 21:43:48 +0100 Subject: [PATCH] Fix --- manifest.toml | 30 +++++++++--------------------- scripts/_common.sh | 1 - scripts/install | 1 + scripts/restore | 1 + scripts/upgrade | 1 + 5 files changed, 12 insertions(+), 22 deletions(-) diff --git a/manifest.toml b/manifest.toml index 8f6d7bd..b496cbc 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Immich" description.en = "Photo and video backup solution directly from your mobile phone" description.fr = "Sauvegarde de photos et de vidéos directement depuis votre mobile" -version = "1.123.0~ynh1" +version = "1.123.0~ynh2" maintainers = ["ewilly"] @@ -19,7 +19,7 @@ userdoc = "https://github.com/immich-app/immich#getting-started" code = "https://github.com/immich-app/immich" [integration] -yunohost = ">= 11.2.18" +yunohost = ">= 12" helpers_version = "2.1" architectures = ["arm64", "amd64"] multi_instance = false @@ -73,25 +73,15 @@ ram.runtime = "500M" [resources.apt] packages = [ - "python3-venv", - "python3-dev", - "ffmpeg", + "pipx", + "curl", "postgresql", - "wget", - "build-essential", - "libreadline-dev", - "libncursesw5-dev", - "libssl-dev", - "libsqlite3-dev", - "tk-dev", - "libgdbm-dev", - "libc6-dev", - "libbz2-dev", - "libffi-dev", - "zlib1g-dev", - "unzip", + "redis-server", + "python3", "uuid-runtime", "autoconf", + "build-essential", + "unzip", "jq", "perl", "libnet-ssleay-perl", @@ -113,9 +103,7 @@ ram.runtime = "500M" "libmojolicious-perl", "libfile-slurper-perl", "liblcms2-2", - "libllvm16", - "libllvm13", - "redis-server" + "wget" ] [resources.apt.extras.postgresql] diff --git a/scripts/_common.sh b/scripts/_common.sh index f5918b1..f0d280f 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -18,7 +18,6 @@ app_node_version() { | cut -d':' -f2 \ | cut -d'.' -f1 } -nodejs_version=$(app_node_version) # Fail2ban failregex="$app-server.*Failed login attempt for user.+from ip address\s?" diff --git a/scripts/install b/scripts/install index 6ba7911..171f115 100755 --- a/scripts/install +++ b/scripts/install @@ -19,6 +19,7 @@ ynh_setup_source --source_id="ffmpeg-static" --dest_dir="$ffmpeg_static_dir" #================================================= ynh_script_progression "Installing nodejs..." +nodejs_version=$(app_node_version) ynh_nodejs_install #================================================= diff --git a/scripts/restore b/scripts/restore index c9c01ea..6b219f8 100755 --- a/scripts/restore +++ b/scripts/restore @@ -22,6 +22,7 @@ ynh_restore "$data_dir" #================================================= ynh_script_progression "Reinstalling nodejs..." +nodejs_version=$(app_node_version) ynh_nodejs_install #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 24ff017..d66aa16 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -47,6 +47,7 @@ ynh_setup_source --source_id="ffmpeg-static" --dest_dir="$ffmpeg_static_dir" --f #================================================= ynh_script_progression "Installing nodejs..." +nodejs_version=$(app_node_version) ynh_nodejs_install #=================================================