major invidious and immich updates, fixes
This commit is contained in:
@@ -33,9 +33,9 @@ services:
|
|||||||
## Immich (photo library management)
|
## Immich (photo library management)
|
||||||
immich_server:
|
immich_server:
|
||||||
container_name: immich_server
|
container_name: immich_server
|
||||||
image: ghcr.io/immich-app/immich-server:v1.132.1
|
image: ghcr.io/immich-app/immich-server:release
|
||||||
volumes:
|
volumes:
|
||||||
- ${IMMICH_LIBRARY}:/usr/src/app/upload
|
- ${IMMICH_LIBRARY}:/data
|
||||||
env_file:
|
env_file:
|
||||||
- ${ENV_DIR}/immich.env
|
- ${ENV_DIR}/immich.env
|
||||||
environment:
|
environment:
|
||||||
@@ -54,7 +54,7 @@ services:
|
|||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
immich-machine-learning:
|
immich-machine-learning:
|
||||||
container_name: immich_machine_learning
|
container_name: immich_machine_learning
|
||||||
image: ghcr.io/immich-app/immich-machine-learning:v1.132.1
|
image: ghcr.io/immich-app/immich-machine-learning:release
|
||||||
volumes:
|
volumes:
|
||||||
- model-cache:/cache
|
- model-cache:/cache
|
||||||
env_file:
|
env_file:
|
||||||
@@ -66,7 +66,7 @@ services:
|
|||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
immich_db:
|
immich_db:
|
||||||
container_name: immich_db
|
container_name: immich_db
|
||||||
image: tensorchord/pgvecto-rs:pg14-v0.2.0@sha256:90724186f0a3517cf6914295b5ab410db9ce23190a2d9d0b9dd6463e3fa298f0
|
image: ghcr.io/immich-app/postgres:14-vectorchord0.3.0-pgvectors0.2.0
|
||||||
env_file:
|
env_file:
|
||||||
- ${ENV_DIR}/immich.env
|
- ${ENV_DIR}/immich.env
|
||||||
volumes:
|
volumes:
|
||||||
@@ -88,23 +88,40 @@ services:
|
|||||||
retries: 2
|
retries: 2
|
||||||
depends_on:
|
depends_on:
|
||||||
- invidious-db
|
- invidious-db
|
||||||
- invidious-sighelper
|
- invidious-companion
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
invidious-sighelper:
|
invidious-companion:
|
||||||
container_name: invidious-sighelper
|
container_name: invidious-companion
|
||||||
image: quay.io/invidious/inv-sig-helper:latest
|
image: quay.io/invidious/invidious-companion:latest
|
||||||
init: true
|
logging:
|
||||||
command: ["--tcp", "0.0.0.0:12999"]
|
options:
|
||||||
ports:
|
max-size: "1G"
|
||||||
- 12999:12999
|
max-file: "4"
|
||||||
environment:
|
volumes:
|
||||||
- RUST_LOG=info
|
- companioncache:/var/tmp/youtubei.js:rw
|
||||||
|
env_file:
|
||||||
|
- ${ENV_DIR}/invidious.env
|
||||||
cap_drop:
|
cap_drop:
|
||||||
- ALL
|
- ALL
|
||||||
read_only: true
|
read_only: true
|
||||||
security_opt:
|
security_opt:
|
||||||
- no-new-privileges:true
|
- no-new-privileges:true
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
# invidious-sighelper:
|
||||||
|
# container_name: invidious-sighelper
|
||||||
|
# image: quay.io/invidious/inv-sig-helper:latest
|
||||||
|
# init: true
|
||||||
|
# command: ["--tcp", "0.0.0.0:12999"]
|
||||||
|
# ports:
|
||||||
|
# - 12999:12999
|
||||||
|
# environment:
|
||||||
|
# - RUST_LOG=info
|
||||||
|
# cap_drop:
|
||||||
|
# - ALL
|
||||||
|
# read_only: true
|
||||||
|
# security_opt:
|
||||||
|
# - no-new-privileges:true
|
||||||
|
# restart: unless-stopped
|
||||||
invidious-db:
|
invidious-db:
|
||||||
container_name: invidious-db
|
container_name: invidious-db
|
||||||
image: docker.io/library/postgres:14
|
image: docker.io/library/postgres:14
|
||||||
@@ -119,7 +136,7 @@ services:
|
|||||||
## Jellyfin (media server)
|
## Jellyfin (media server)
|
||||||
jellyfin:
|
jellyfin:
|
||||||
container_name: jellyfin
|
container_name: jellyfin
|
||||||
image: lscr.io/linuxserver/jellyfin:latest
|
image: lscr.io/linuxserver/jellyfin:10.10.7
|
||||||
environment:
|
environment:
|
||||||
- TZ=${TZ}
|
- TZ=${TZ}
|
||||||
- PUID=1000
|
- PUID=1000
|
||||||
@@ -185,8 +202,9 @@ services:
|
|||||||
- XDG_CACHE_HOME=/cache
|
- XDG_CACHE_HOME=/cache
|
||||||
- TMPDIR=/tmp
|
- TMPDIR=/tmp
|
||||||
- TZ=${TZ}
|
- TZ=${TZ}
|
||||||
ports:
|
dns:
|
||||||
- 9898:9898
|
- ${DNS_IP}
|
||||||
|
network_mode: host
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
## ConvertX (file converter)
|
## ConvertX (file converter)
|
||||||
@@ -667,9 +685,9 @@ services:
|
|||||||
container_name: bazarr
|
container_name: bazarr
|
||||||
image: lscr.io/linuxserver/bazarr:latest
|
image: lscr.io/linuxserver/bazarr:latest
|
||||||
environment:
|
environment:
|
||||||
- puid=1000
|
- PUID=1000
|
||||||
- pgid=1000
|
- PGID=1000
|
||||||
- tz=america/chicago
|
- TZ=${TZ}
|
||||||
volumes:
|
volumes:
|
||||||
- ${DOCKER_DIR}/bazarr:/config
|
- ${DOCKER_DIR}/bazarr:/config
|
||||||
- ${JF_MOVIES}:/movies
|
- ${JF_MOVIES}:/movies
|
||||||
@@ -744,8 +762,8 @@ services:
|
|||||||
#---------------- DOCKER ----------------#
|
#---------------- DOCKER ----------------#
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
|
companioncache:
|
||||||
hoarder:
|
hoarder:
|
||||||
joplindb:
|
|
||||||
meilisearch:
|
meilisearch:
|
||||||
model-cache:
|
model-cache:
|
||||||
miniflux-db:
|
miniflux-db:
|
||||||
|
|||||||
13
readme.md
13
readme.md
@@ -194,7 +194,9 @@ POSTGRES_DB=immich
|
|||||||
|
|
||||||
[Docs](https://docs.invidious.io/installation/)
|
[Docs](https://docs.invidious.io/installation/)
|
||||||
|
|
||||||
Note that the `password` under `db` in `INVIDIOUS_CONFIG` should be the same as the `POSTGRES_PASSWORD`. The `hmac_key` should be a different, randomly generated value
|
Note that the `password` under `db` in `INVIDIOUS_CONFIG` should be the same as the `POSTGRES_PASSWORD`.
|
||||||
|
|
||||||
|
The `hmac_key` should be a different, randomly generated value, and the `invidious_companion_key`/`SERVER_SECRET_KEY` should both be set to another different, randomly generated value.
|
||||||
|
|
||||||
```env
|
```env
|
||||||
# invidious.env
|
# invidious.env
|
||||||
@@ -208,9 +210,9 @@ INVIDIOUS_CONFIG='
|
|||||||
host: invidious-db
|
host: invidious-db
|
||||||
port: 5432
|
port: 5432
|
||||||
check_tables: true
|
check_tables: true
|
||||||
signature_server: invidious-sighelper:12999
|
invidious_companion:
|
||||||
visitor_data:
|
- private_url: "http://invidious-companion:8282/companion"
|
||||||
po_token:
|
invidious_companion_key: ""
|
||||||
external_port: 9080
|
external_port: 9080
|
||||||
https_only: false
|
https_only: false
|
||||||
statistics_enabled: false
|
statistics_enabled: false
|
||||||
@@ -224,6 +226,9 @@ INVIDIOUS_CONFIG='
|
|||||||
default_home: Trending
|
default_home: Trending
|
||||||
'
|
'
|
||||||
|
|
||||||
|
# Companion
|
||||||
|
SERVER_SECRET_KEY=
|
||||||
|
|
||||||
# Database
|
# Database
|
||||||
POSTGRES_DB=invidious
|
POSTGRES_DB=invidious
|
||||||
POSTGRES_USER=invidious
|
POSTGRES_USER=invidious
|
||||||
|
|||||||
Reference in New Issue
Block a user