From 93232d640eb2836add795e1916a4b073335e1082 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 29 Jul 2024 11:11:56 +0000 Subject: [PATCH 1/3] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_id.md | 2 +- README_zh_Hans.md | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 70c27df..7c946e0 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Self-hosted photo and video management solution. - Easy-to-use and friendly interface ; -**Shipped version:** 1.110.0~ynh1 +**Shipped version:** 1.110.0~ynh2 ## Screenshots diff --git a/README_es.md b/README_es.md index c81d653..f0a7973 100644 --- a/README_es.md +++ b/README_es.md @@ -24,7 +24,7 @@ Self-hosted photo and video management solution. - Easy-to-use and friendly interface ; -**Versión actual:** 1.110.0~ynh1 +**Versión actual:** 1.110.0~ynh2 ## Capturas diff --git a/README_eu.md b/README_eu.md index 6b6c104..eec73ba 100644 --- a/README_eu.md +++ b/README_eu.md @@ -24,7 +24,7 @@ Self-hosted photo and video management solution. - Easy-to-use and friendly interface ; -**Paketatutako bertsioa:** 1.110.0~ynh1 +**Paketatutako bertsioa:** 1.110.0~ynh2 ## Pantaila-argazkiak diff --git a/README_fr.md b/README_fr.md index f47f817..4f3ed2f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -24,7 +24,7 @@ Solution d'autohébergement pour a gestion de vos photos et vidéos. - Interface conviviale et egronomique ; -**Version incluse :** 1.110.0~ynh1 +**Version incluse :** 1.110.0~ynh2 ## Captures d’écran diff --git a/README_gl.md b/README_gl.md index 1635462..75ac023 100644 --- a/README_gl.md +++ b/README_gl.md @@ -24,7 +24,7 @@ Self-hosted photo and video management solution. - Easy-to-use and friendly interface ; -**Versión proporcionada:** 1.110.0~ynh1 +**Versión proporcionada:** 1.110.0~ynh2 ## Capturas de pantalla diff --git a/README_id.md b/README_id.md index ed9c2c5..32c8022 100644 --- a/README_id.md +++ b/README_id.md @@ -24,7 +24,7 @@ Self-hosted photo and video management solution. - Easy-to-use and friendly interface ; -**Versi terkirim:** 1.110.0~ynh1 +**Versi terkirim:** 1.110.0~ynh2 ## Tangkapan Layar diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 51436e2..b4af3cf 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -24,7 +24,7 @@ Self-hosted photo and video management solution. - Easy-to-use and friendly interface ; -**分发版本：** 1.110.0~ynh1 +**分发版本：** 1.110.0~ynh2 ## 截图 From 3d286c51e666b36fc431d4552f495695b3f5d90d Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 29 Jul 2024 13:12:32 +0200 Subject: [PATCH 2/3] Move to ffmpeg-static --- manifest.toml | 15 +++++++-------- scripts/_common.sh | 4 ++-- scripts/install | 3 +++ scripts/upgrade | 4 ++++ 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/manifest.toml b/manifest.toml index b1a4d44..c483e33 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.110.0~ynh1" +version = "1.110.0~ynh2" maintainers = ["ewilly"] @@ -47,6 +47,12 @@ ram.runtime = "500M" autoupdate.strategy = "latest_github_release" + [resources.sources.ffmpeg-static] + amd64.url = "https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz" + amd64.sha256 = "5341ac10c505b9217740790d56d8e63e590d74ca81e3e56796e4c98f7be80b61" + arm64.url = "https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-arm64-static.tar.xz" + arm64.sha256 = "7387f7aae3ae88cbaad5c66155fdf23ce0c0dbeaf4b1e573d704817938cd1b8e" + [resources.ports] main.default = 3001 machinelearning.default = 3003 @@ -126,12 +132,5 @@ ram.runtime = "500M" "postgresql-client-common" ] - [resources.apt.extras.jellyfin-ffmpeg] - repo = "deb [arch=__YNH_ARCH__] https://repo.jellyfin.org/debian __YNH_DEBIAN_VERSION__ main" - key = "https://repo.jellyfin.org/jellyfin_team.gpg.key" - packages = [ - "jellyfin-ffmpeg6" - ] - [resources.database] type = "postgresql" diff --git a/scripts/_common.sh b/scripts/_common.sh index 6d47c46..d902357 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -122,8 +122,8 @@ myynh_install_immich() { # Thanks to https://github.com/arter97/immich-native # Check https://github.com/immich-app/base-images/blob/main/server/Dockerfile for changes - # Add jellyfin-ffmpeg to $PATH - PATH="/usr/lib/jellyfin-ffmpeg:$PATH" + # Add ffmpeg-static direcotry to $PATH + PATH="$ffmpeg_static_dir:$PATH" # Use ynh nodejs helper ynh_use_nodejs diff --git a/scripts/install b/scripts/install index 5466941..594032c 100755 --- a/scripts/install +++ b/scripts/install @@ -16,6 +16,9 @@ ynh_script_progression --message="Setting up source files..." --weight=1 source_dir="$install_dir/source" ynh_setup_source --source_id="main" --dest_dir="$source_dir" +ffmpeg_static_dir="$install_dir/ffmpeg-static" +ynh_setup_source --source_id="ffmpeg-static" --dest_dir="$ffmpeg_static_dir" + #================================================= # CHECK PYTHON VERSION AND COMPILE IF NEEDED #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 5108b66..c6ffcff 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -26,9 +26,13 @@ ynh_systemd_action --service_name="$app-machine-learning" --action="stop" ynh_script_progression --message="Upgrading source files..." --weight=1 ynh_secure_remove --file="$install_dir" + source_dir="$install_dir/source" ynh_setup_source --source_id="main" --dest_dir="$source_dir" --full_replace=1 +ffmpeg_static_dir="$install_dir/ffmpeg-static" +ynh_setup_source --source_id="ffmpeg-static" --dest_dir="$ffmpeg_static_dir" --full_replace=1 + #================================================= # CHECK PYTHON VERSION AND COMPILE IF NEEDED #================================================= From 8db8ccab400829a03998eccaf61c99614c3cad56 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 29 Jul 2024 13:14:22 +0200 Subject: [PATCH 3/3] Update tests.toml --- tests.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests.toml b/tests.toml index 32182b1..abc0324 100644 --- a/tests.toml +++ b/tests.toml @@ -7,6 +7,6 @@ test_format = 1.0 # Commits to test upgrade from dfaa8785a61758eea4fe558ffe6a3090a9efdfb0 # v1.105.1 with separeted microservices container/process # ------------------------------- - test_upgrade_from.dfaa878.name = "1.105.1~ynh1" - test_upgrade_from.dfaa878.args.domain = "sub.domain.tld" - test_upgrade_from.dfaa878.args.init_main_permission = "visitors" + # test_upgrade_from.dfaa878.name = "1.105.1~ynh1" + # test_upgrade_from.dfaa878.args.domain = "sub.domain.tld" + # test_upgrade_from.dfaa878.args.init_main_permission = "visitors"