mirror of
https://github.com/YunoHost-Apps/immich_ynh.git
synced 2024-09-03 20:36:24 +02:00
Merge pull request #75 from YunoHost-Apps/ffmpeg-static
Move to ffmpeg-static
This commit is contained in:
ewilly
GitHub
commit
d9ccf56f71
12 changed files with 26 additions and 20 deletions
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
## 截图
|
||||
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
#=================================================
|
||||
|
|
|
|||
|
|
@ -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
|
||||
#=================================================
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
Loading…
Reference in a new issue