From dcd46a1d0a24fb0aee81fbd234071cc89d92765b Mon Sep 17 00:00:00 2001 From: okxlin Date: Mon, 15 Jul 2024 23:08:52 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=9B=B4=E6=96=B0immich=E5=88=B01.108.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/immich/1.106.4/config.env | 18 --- apps/immich/{1.106.4 => 1.108.0}/.env.sample | 0 apps/immich/{1.106.4 => 1.108.0}/data.yml | 0 .../{1.106.4 => 1.108.0}/docker-compose.yml | 48 +++---- apps/immich/README.md | 129 ++++-------------- apps/immich/release/config.env | 18 --- apps/immich/release/docker-compose.yml | 44 ++---- 7 files changed, 62 insertions(+), 195 deletions(-) delete mode 100644 apps/immich/1.106.4/config.env rename apps/immich/{1.106.4 => 1.108.0}/.env.sample (100%) rename apps/immich/{1.106.4 => 1.108.0}/data.yml (100%) rename apps/immich/{1.106.4 => 1.108.0}/docker-compose.yml (72%) delete mode 100644 apps/immich/release/config.env diff --git a/apps/immich/1.106.4/config.env b/apps/immich/1.106.4/config.env deleted file mode 100644 index 041d94a0..00000000 --- a/apps/immich/1.106.4/config.env +++ /dev/null @@ -1,18 +0,0 @@ -# You can find documentation for all the supported env variables at https://immich.app/docs/install/environment-variables - -# The location where your uploaded files are stored -UPLOAD_LOCATION=${UPLOAD_LOCATION} - -# The Immich version to use. You can pin this to a specific version like "v1.71.0" -#IMMICH_VERSION=release - -# Connection secret for postgres. You should change it to a random password -DB_PASSWORD=${PANEL_DB_USER_PASSWORD} - -# The values below this line do not need to be changed -################################################################################### -DB_HOSTNAME=${CONTAINER_NAME}-postgres -DB_USERNAME=${PANEL_DB_USER} -DB_DATABASE_NAME=${PANEL_DB_NAME} - -REDIS_HOSTNAME=${CONTAINER_NAME}-redis diff --git a/apps/immich/1.106.4/.env.sample b/apps/immich/1.108.0/.env.sample similarity index 100% rename from apps/immich/1.106.4/.env.sample rename to apps/immich/1.108.0/.env.sample diff --git a/apps/immich/1.106.4/data.yml b/apps/immich/1.108.0/data.yml similarity index 100% rename from apps/immich/1.106.4/data.yml rename to apps/immich/1.108.0/data.yml diff --git a/apps/immich/1.106.4/docker-compose.yml b/apps/immich/1.108.0/docker-compose.yml similarity index 72% rename from apps/immich/1.106.4/docker-compose.yml rename to apps/immich/1.108.0/docker-compose.yml index a5c1c8ee..20e79e98 100644 --- a/apps/immich/1.106.4/docker-compose.yml +++ b/apps/immich/1.108.0/docker-compose.yml @@ -4,13 +4,17 @@ services: restart: always networks: - 1panel-network - image: altran1502/immich-server:v1.106.4 + image: altran1502/immich-server:v1.108.0 command: [ "start.sh", "immich" ] volumes: - ${UPLOAD_LOCATION}:/usr/src/app/upload - /etc/localtime:/etc/localtime:ro - env_file: - - config.env + environment: + - DB_PASSWORD=${PANEL_DB_USER_PASSWORD} + - DB_HOSTNAME=${CONTAINER_NAME}-postgres + - DB_USERNAME=${PANEL_DB_USER} + - DB_DATABASE_NAME=${PANEL_DB_NAME} + - REDIS_HOSTNAME=${CONTAINER_NAME}-redis ports: - ${PANEL_APP_PORT_HTTP}:3001 depends_on: @@ -19,37 +23,20 @@ services: labels: createdBy: "Apps" - immich-microservices: - container_name: ${CONTAINER_NAME}-microservices - restart: always - networks: - - 1panel-network - image: altran1502/immich-server:v1.106.4 - # extends: - # file: hwaccel.yml - # service: hwaccel - command: [ "start.sh", "microservices" ] - volumes: - - ${UPLOAD_LOCATION}:/usr/src/app/upload - - /etc/localtime:/etc/localtime:ro - env_file: - - config.env - depends_on: - - immich-redis - - immich-database - labels: - createdBy: "Apps" - immich-machine-learning: container_name: ${CONTAINER_NAME}-machine_learning restart: always networks: - 1panel-network - image: altran1502/immich-machine-learning:v1.106.4 + image: altran1502/immich-machine-learning:v1.108.0 volumes: - ${CACHE_PATH}:/cache - env_file: - - config.env + environment: + - DB_PASSWORD=${PANEL_DB_USER_PASSWORD} + - DB_HOSTNAME=${CONTAINER_NAME}-postgres + - DB_USERNAME=${PANEL_DB_USER} + - DB_DATABASE_NAME=${PANEL_DB_NAME} + - REDIS_HOSTNAME=${CONTAINER_NAME}-redis labels: createdBy: "Apps" @@ -70,9 +57,8 @@ services: networks: - 1panel-network image: "tensorchord/pgvecto-rs:pg14-v0.2.0" - env_file: - - config.env environment: + - REDIS_HOSTNAME=${CONTAINER_NAME}-redis - POSTGRES_PASSWORD=${PANEL_DB_USER_PASSWORD} - POSTGRES_USER=${PANEL_DB_USER} - POSTGRES_DB=${PANEL_DB_NAME} @@ -88,6 +74,6 @@ services: labels: createdBy: "Apps" -networks: - 1panel-network: +networks: + 1panel-network: external: true \ No newline at end of file diff --git a/apps/immich/README.md b/apps/immich/README.md index b55b7e76..8d7b7658 100644 --- a/apps/immich/README.md +++ b/apps/immich/README.md @@ -1,115 +1,46 @@


- License: MIT - - Discord + License: AGPLv3 + +

- + +

+

高性能的照片和视频自托管解决方案

+

-

Immich - High performance self-hosted photo and video backup solution



- Català - Español - Français - Italiano - 日本語 - 한국어 - Deutsch - Nederlands - Türkçe - 中文 - Русский + + English + Català + Español + Français + Italiano + 日本語 + 한국어 + Deutsch + Nederlands + Türkçe + Русский + Português Brasileiro + Svenska + العربية +

-## Disclaimer +## 免责声明 -- ⚠️ The project is under **very active** development. -- ⚠️ Expect bugs and breaking changes. -- ⚠️ **Do not use the app as the only way to store your photos and videos.** -- ⚠️ Always follow [3-2-1](https://www.backblaze.com/blog/the-3-2-1-backup-strategy/) backup plan for your precious photos and videos! +- ⚠️ 本项目正在 **非常活跃** 地开发中。 +- ⚠️ 可能存在 bug 或者随时有重大变更。 +- ⚠️ **不要把本软件作为您存储照片或视频的唯一方式。** +- ⚠️ 为了您宝贵的照片与视频，请始终遵守 [3-2-1](https://www.backblaze.com/blog/the-3-2-1-backup-strategy/) 备份方案！ -## Content - -- [Official Documentation](https://immich.app/docs) -- [Roadmap](https://github.com/orgs/immich-app/projects/1) -- [Demo](#demo) -- [Features](#features) -- [Introduction](https://immich.app/docs/overview/introduction) -- [Installation](https://immich.app/docs/install/requirements) -- [Contribution Guidelines](https://immich.app/docs/overview/support-the-project) -- [Support The Project](#support-the-project) - -## Documentation - -You can find the main documentation, including installation guides, at https://immich.app/. - -## Demo - -You can access the web demo at https://demo.immich.app - -For the mobile app, you can use `https://demo.immich.app/api` for the `Server Endpoint URL` - -```bash title="Demo Credential" -The credential -email: demo@immich.app -password: demo -``` - -``` -Spec: Free-tier Oracle VM - Amsterdam - 2.4Ghz quad-core ARM64 CPU, 24GB RAM -``` - -## Features - -| Features | Mobile | Web | -| -------------------------------------------- | ------ | --- | -| Upload and view videos and photos | Yes | Yes | -| Auto backup when the app is opened | Yes | N/A | -| Selective album(s) for backup | Yes | N/A | -| Download photos and videos to local device | Yes | Yes | -| Multi-user support | Yes | Yes | -| Album and Shared albums | Yes | Yes | -| Scrubbable/draggable scrollbar | Yes | Yes | -| Support raw formats | Yes | Yes | -| Metadata view (EXIF, map) | Yes | Yes | -| Search by metadata, objects, faces, and CLIP | Yes | Yes | -| Administrative functions (user management) | No | Yes | -| Background backup | Yes | N/A | -| Virtual scroll | Yes | Yes | -| OAuth support | Yes | Yes | -| API Keys | N/A | Yes | -| LivePhoto/MotionPhoto backup and playback | Yes | Yes | -| User-defined storage structure | Yes | Yes | -| Public Sharing | No | Yes | -| Archive and Favorites | Yes | Yes | -| Global Map | Yes | Yes | -| Partner Sharing | Yes | Yes | -| Facial recognition and clustering | Yes | Yes | -| Memories (x years ago) | Yes | Yes | -| Offline support | Yes | No | -| Read-only gallery | Yes | Yes | -| Stacked Photos | Yes | Yes | - -## Support the project - -I've committed to this project, and I will not stop. I will keep updating the docs, adding new features, and fixing bugs. But I can't do it alone. So I need your help to give me additional motivation to keep going. - -As our hosts in the [selfhosted.show - In the episode 'The-organization-must-not-be-name is a Hostile Actor'](https://selfhosted.show/79?t=1418) said, this is a massive undertaking of what the team and I are doing. And I would love to someday be able to do this full-time, and I am asking for your help to make that happen. - -If you feel like this is the right cause and the app is something you are seeing yourself using for a long time, please consider supporting the project with the option below. - -### Donation - -- [Monthly donation](https://github.com/sponsors/alextran1502) via GitHub Sponsors -- [One-time donation](https://github.com/sponsors/alextran1502?frequency=one-time&sponsor=alextran1502) via GitHub Sponsors -- [Liberapay](https://liberapay.com/alex.tran1502/) -- [buymeacoffee](https://www.buymeacoffee.com/altran1502) -- Bitcoin: 1FvEp6P6NM8EZEkpGUFAN2LqJ1gxusNxZX -- ZCash: u1smm4wvqegcp46zss2jf5xptchgeczp4rx7a0wu3mermf2wxahm26yyz5w9mw3f2p4emwlljxjumg774kgs8rntt9yags0whnzane4n67z4c7gppq4yyvcj404ne3r769prwzd9j8ntvqp44fa6d67sf7rmcfjmds3gmeceff4u8e92rh38nd30cr96xw6vfhk6scu4ws90ldzupr3sz +> [!NOTE] +> 完整的项目文档以及安装教程请参见：https://immich.app/。 diff --git a/apps/immich/release/config.env b/apps/immich/release/config.env deleted file mode 100644 index 041d94a0..00000000 --- a/apps/immich/release/config.env +++ /dev/null @@ -1,18 +0,0 @@ -# You can find documentation for all the supported env variables at https://immich.app/docs/install/environment-variables - -# The location where your uploaded files are stored -UPLOAD_LOCATION=${UPLOAD_LOCATION} - -# The Immich version to use. You can pin this to a specific version like "v1.71.0" -#IMMICH_VERSION=release - -# Connection secret for postgres. You should change it to a random password -DB_PASSWORD=${PANEL_DB_USER_PASSWORD} - -# The values below this line do not need to be changed -################################################################################### -DB_HOSTNAME=${CONTAINER_NAME}-postgres -DB_USERNAME=${PANEL_DB_USER} -DB_DATABASE_NAME=${PANEL_DB_NAME} - -REDIS_HOSTNAME=${CONTAINER_NAME}-redis diff --git a/apps/immich/release/docker-compose.yml b/apps/immich/release/docker-compose.yml index fba44635..2f2be3df 100644 --- a/apps/immich/release/docker-compose.yml +++ b/apps/immich/release/docker-compose.yml @@ -9,8 +9,12 @@ services: volumes: - ${UPLOAD_LOCATION}:/usr/src/app/upload - /etc/localtime:/etc/localtime:ro - env_file: - - config.env + environment: + - DB_PASSWORD=${PANEL_DB_USER_PASSWORD} + - DB_HOSTNAME=${CONTAINER_NAME}-postgres + - DB_USERNAME=${PANEL_DB_USER} + - DB_DATABASE_NAME=${PANEL_DB_NAME} + - REDIS_HOSTNAME=${CONTAINER_NAME}-redis ports: - ${PANEL_APP_PORT_HTTP}:3001 depends_on: @@ -19,27 +23,6 @@ services: labels: createdBy: "Apps" - immich-microservices: - container_name: ${CONTAINER_NAME}-microservices - restart: always - networks: - - 1panel-network - image: altran1502/immich-server:release - # extends: - # file: hwaccel.yml - # service: hwaccel - command: [ "start.sh", "microservices" ] - volumes: - - ${UPLOAD_LOCATION}:/usr/src/app/upload - - /etc/localtime:/etc/localtime:ro - env_file: - - config.env - depends_on: - - immich-redis - - immich-database - labels: - createdBy: "Apps" - immich-machine-learning: container_name: ${CONTAINER_NAME}-machine_learning restart: always @@ -48,8 +31,12 @@ services: image: altran1502/immich-machine-learning:release volumes: - ${CACHE_PATH}:/cache - env_file: - - config.env + environment: + - DB_PASSWORD=${PANEL_DB_USER_PASSWORD} + - DB_HOSTNAME=${CONTAINER_NAME}-postgres + - DB_USERNAME=${PANEL_DB_USER} + - DB_DATABASE_NAME=${PANEL_DB_NAME} + - REDIS_HOSTNAME=${CONTAINER_NAME}-redis labels: createdBy: "Apps" @@ -70,9 +57,8 @@ services: networks: - 1panel-network image: "tensorchord/pgvecto-rs:pg14-v0.2.0" - env_file: - - config.env environment: + - REDIS_HOSTNAME=${CONTAINER_NAME}-redis - POSTGRES_PASSWORD=${PANEL_DB_USER_PASSWORD} - POSTGRES_USER=${PANEL_DB_USER} - POSTGRES_DB=${PANEL_DB_NAME} @@ -88,6 +74,6 @@ services: labels: createdBy: "Apps" -networks: - 1panel-network: +networks: + 1panel-network: external: true \ No newline at end of file