mirror of
https://github.com/YunoHost-Apps/immich_ynh.git
synced 2024-09-03 20:36:24 +02:00
Merge pull request #62 from YunoHost-Apps/master-promotion
Upgrade master from testing
This commit is contained in:
ewilly
GitHub
commit
1daf6b6c87
10 changed files with 70 additions and 31 deletions
|
|
@ -24,7 +24,7 @@ Self-hosted photo and video management solution.
|
|||
- Easy-to-use and friendly interface ;
|
||||
|
||||
|
||||
**Shipped version:** 1.107.2~ynh1
|
||||
**Shipped version:** 1.108.0~ynh1
|
||||
|
||||
## Screenshots
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ Self-hosted photo and video management solution.
|
|||
- Easy-to-use and friendly interface ;
|
||||
|
||||
|
||||
**Versión actual:** 1.107.2~ynh1
|
||||
**Versión actual:** 1.108.0~ynh1
|
||||
|
||||
## Capturas
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ Self-hosted photo and video management solution.
|
|||
- Easy-to-use and friendly interface ;
|
||||
|
||||
|
||||
**Paketatutako bertsioa:** 1.107.2~ynh1
|
||||
**Paketatutako bertsioa:** 1.108.0~ynh1
|
||||
|
||||
## 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.107.2~ynh1
|
||||
**Version incluse :** 1.108.0~ynh1
|
||||
|
||||
## Captures d’écran
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ Self-hosted photo and video management solution.
|
|||
- Easy-to-use and friendly interface ;
|
||||
|
||||
|
||||
**Versión proporcionada:** 1.107.2~ynh1
|
||||
**Versión proporcionada:** 1.108.0~ynh1
|
||||
|
||||
## Capturas de pantalla
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ Self-hosted photo and video management solution.
|
|||
- Easy-to-use and friendly interface ;
|
||||
|
||||
|
||||
**分发版本：** 1.107.2~ynh1
|
||||
**分发版本：** 1.108.0~ynh1
|
||||
|
||||
## 截图
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
NODE_ENV=production
|
||||
IMMICH_MEDIA_LOCATION=__DATA_DIR__
|
||||
IMMICH_WEB_ROOT=__INSTALL_DIR__/app/www
|
||||
IMMICH_REVERSE_GEOCODING_ROOT=__INSTALL_DIR__/app/resources
|
||||
|
||||
## Ports
|
||||
IMMICH_HOST=127.0.0.1
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -a
|
||||
. "__INSTALL_DIR__/env-server"
|
||||
source "__INSTALL_DIR__/env-server"
|
||||
set +a
|
||||
|
||||
cd "__INSTALL_DIR__/app"
|
||||
|
|
|
|||
|
|
@ -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.107.2~ynh1"
|
||||
version = "1.108.0~ynh1"
|
||||
|
||||
maintainers = ["ewilly"]
|
||||
|
||||
|
|
@ -42,8 +42,8 @@ ram.runtime = "500M"
|
|||
[resources.sources]
|
||||
|
||||
[resources.sources.main]
|
||||
url = "https://github.com/immich-app/immich/archive/refs/tags/v1.107.2.tar.gz"
|
||||
sha256 = "99be31d0ec09d4c29b28449fa8e008c6861ff4a6d3a04488dc480a210e2e870a"
|
||||
url = "https://github.com/immich-app/immich/archive/refs/tags/v1.108.0.tar.gz"
|
||||
sha256 = "102e2c91a30e64471ff565bf232cd5ddeedd15e609e7ad05436a86fb550657c0"
|
||||
|
||||
autoupdate.strategy = "latest_github_release"
|
||||
|
||||
|
|
@ -84,7 +84,30 @@ ram.runtime = "500M"
|
|||
"libbz2-dev",
|
||||
"libffi-dev",
|
||||
"zlib1g-dev",
|
||||
"unzip"
|
||||
"unzip",
|
||||
"uuid-runtime",
|
||||
"autoconf",
|
||||
"jq",
|
||||
"perl",
|
||||
"libnet-ssleay-perl",
|
||||
"libio-socket-ssl-perl",
|
||||
"libcapture-tiny-perl",
|
||||
"libfile-which-perl",
|
||||
"libfile-chdir-perl",
|
||||
"libpkgconfig-perl",
|
||||
"libffi-checklib-perl",
|
||||
"libtest-warnings-perl",
|
||||
"libtest-fatal-perl",
|
||||
"libtest-needs-perl",
|
||||
"libtest2-suite-perl",
|
||||
"libsort-versions-perl",
|
||||
"libpath-tiny-perl",
|
||||
"libtry-tiny-perl",
|
||||
"libterm-table-perl",
|
||||
"libany-uri-escape-perl",
|
||||
"libmojolicious-perl",
|
||||
"libfile-slurper-perl",
|
||||
"liblcms2-2"
|
||||
]
|
||||
|
||||
[resources.apt.extras.postgresql]
|
||||
|
|
|
|||
|
|
@ -123,6 +123,33 @@ myynh_install_immich() {
|
|||
|
||||
ynh_use_nodejs
|
||||
|
||||
# Use 127.0.0.1
|
||||
cd "$source_dir"
|
||||
find . -type f \( -name '*.ts' -o -name '*.js' \) \
|
||||
-exec grep app.listen {} + \
|
||||
| sed 's/.*app.listen//' | grep -v '()' \
|
||||
| grep '^(' \
|
||||
| tr -d "[:blank:]" | awk -F"[(),]" '{print $2}' \
|
||||
| sort \
|
||||
| uniq \
|
||||
| while read port; do
|
||||
find . -type f \( -name '*.ts' -o -name '*.js' \) \
|
||||
-exec sed -i -e "s@app.listen(${port})@app.listen(${port}, '127.0.0.1')@g" {} +
|
||||
done
|
||||
find . -type f \( -name '*.ts' -o -name '*.js' \) \
|
||||
-exec sed -i -e "s@PrometheusExporter({ port })@PrometheusExporter({ host: '127.0.0.1', port: port })@g" {} +
|
||||
grep -RlE "\"0\.0\.0\.0\"|'0\.0\.0\.0'" \
|
||||
| xargs -n1 sed -i -e "s@'0\.0\.0\.0'@'127.0.0.1'@g" -e 's@"0\.0\.0\.0"@"127.0.0.1"@g'
|
||||
|
||||
# Replace /usr/src
|
||||
cd "$source_dir"
|
||||
grep -Rl "/usr/src" | xargs -n1 sed -i -e "s@/usr/src@$install_dir@g"
|
||||
mkdir -p "$install_dir/cache"
|
||||
grep -RlE "\"/cache\"|'/cache'" \
|
||||
| xargs -n1 sed -i -e "s@\"/cache\"@\"$install_dir/cache\"@g" -e "s@'/cache'@'$install_dir/cache'@g"
|
||||
grep -RlE "\"/build\"|'/build'" \
|
||||
| xargs -n1 sed -i -e "s@\"/build\"@\"$install_dir/app\"@g" -e "s@'/build'@'$install_dir/app'@g"
|
||||
|
||||
# Install immich-server
|
||||
cd "$source_dir/server"
|
||||
ynh_exec_warn_less "$ynh_npm" ci
|
||||
|
|
@ -174,20 +201,6 @@ myynh_install_immich() {
|
|||
ynh_add_config --template="immich-machine-learning-start.sh" --destination="$install_dir/app/machine-learning/start.sh"
|
||||
chmod +x "$install_dir/app/machine-learning/start.sh"
|
||||
|
||||
# Replace /usr/src
|
||||
cd "$install_dir/app"
|
||||
grep -Rl "/usr/src" | xargs -n1 sed -i -e "s@/usr/src@$install_dir@g"
|
||||
ln -sf "$install_dir/app/resources" "$install_dir/"
|
||||
mkdir -p "$install_dir/cache"
|
||||
sed -i -e "s@\"/cache\"@\"$install_dir/cache\"@g" "$install_dir/app/machine-learning/app/config.py"
|
||||
|
||||
# Install sharp
|
||||
cd "$install_dir/app"
|
||||
ynh_exec_warn_less "$ynh_npm" install sharp
|
||||
|
||||
# Use 127.0.0.1
|
||||
sed -i -e "s@app.listen(port)@app.listen(port, '127.0.0.1')@g" "$install_dir/app/dist/main.js"
|
||||
|
||||
# Install geonames
|
||||
mkdir -p "$source_dir/geonames"
|
||||
cd "$source_dir/geonames"
|
||||
|
|
@ -195,11 +208,15 @@ myynh_install_immich() {
|
|||
curl -LO "https://download.geonames.org/export/dump/admin1CodesASCII.txt" 2>&1
|
||||
curl -LO "https://download.geonames.org/export/dump/admin2Codes.txt" 2>&1
|
||||
unzip "cities500.zip"
|
||||
cd "$install_dir/resources"
|
||||
cp -a "$source_dir/geonames/cities500.txt" "$install_dir/resources/"
|
||||
cp -a "$source_dir/geonames/admin1CodesASCII.txt" "$install_dir/resources/"
|
||||
cp -a "$source_dir/geonames/admin2Codes.txt" "$install_dir/resources/"
|
||||
date --iso-8601=seconds | tr -d "\n" > "$install_dir/resources/geodata-date.txt"
|
||||
mkdir -p "$install_dir/app/geodata/"
|
||||
cp -a "$source_dir/geonames/cities500.txt" "$install_dir/app/geodata/"
|
||||
cp -a "$source_dir/geonames/admin1CodesASCII.txt" "$install_dir/app/geodata/"
|
||||
cp -a "$source_dir/geonames/admin2Codes.txt" "$install_dir/app/geodata/"
|
||||
date --iso-8601=seconds | tr -d "\n" > "$install_dir/app/geodata/geodata-date.txt"
|
||||
|
||||
# Install sharp
|
||||
cd "$install_dir/app"
|
||||
ynh_exec_warn_less "$ynh_npm" install sharp
|
||||
|
||||
# Cleanup
|
||||
ynh_secure_remove --file="$source_dir"
|
||||
|
|
|
|||
Loading…
Reference in a new issue