Add Redis storage and improve user setup

This commit is contained in:
Colin Hebert
2024-10-16 17:40:03 +11:00
parent 6fd4c0ec4c
commit 89d43b5c04
3 changed files with 24 additions and 15 deletions

View File

@@ -39,8 +39,9 @@ services:
service: base-service service: base-service
container_name: authelia-redis container_name: authelia-redis
image: redis image: redis
#user: ${NASCOMPOSE_UID?}:${NASCOMPOSE_GID?} user: ${NASCOMPOSE_UID?}:${NASCOMPOSE_GID?}
volumes:
- ./volumes/redis_data/:/data/
lldap: lldap:
extends: extends:
file: ../compose.base.yaml file: ../compose.base.yaml

View File

@@ -8,7 +8,7 @@ services:
container_name: paperless container_name: paperless
image: ghcr.io/paperless-ngx/paperless-ngx image: ghcr.io/paperless-ngx/paperless-ngx
environment: environment:
PAPERLESS_REDIS: redis://paperless-broker:6379 PAPERLESS_REDIS: redis://paperless-redis:6379
USERMAP_UID: ${NASCOMPOSE_UID?} USERMAP_UID: ${NASCOMPOSE_UID?}
USERMAP_GID: ${NASCOMPOSE_GID?} USERMAP_GID: ${NASCOMPOSE_GID?}
PAPERLESS_URL: https://paperless.${NASCOMPOSE_DOMAIN?} PAPERLESS_URL: https://paperless.${NASCOMPOSE_DOMAIN?}
@@ -18,7 +18,7 @@ services:
networks: networks:
- default - default
depends_on: depends_on:
- paperless-broker - paperless-redis
volumes: volumes:
- ./volumes/paperless_data/:/usr/src/paperless/data/ - ./volumes/paperless_data/:/usr/src/paperless/data/
- ${NASCOMPOSE_DATA?}/media/:/usr/src/paperless/media/ - ${NASCOMPOSE_DATA?}/media/:/usr/src/paperless/media/
@@ -26,14 +26,15 @@ services:
- ${NASCOMPOSE_DATA?}/export:/usr/src/paperless/export - ${NASCOMPOSE_DATA?}/export:/usr/src/paperless/export
labels: labels:
traefik.http.routers.paperless.middlewares: authelia@file traefik.http.routers.paperless.middlewares: authelia@file
paperless-broker: paperless-redis:
extends: extends:
file: ../compose.base.yaml file: ../compose.base.yaml
service: base-service service: base-service
container_name: paperless-broker container_name: paperless-redis
image: redis image: redis
user: ${NASCOMPOSE_UID?}:${NASCOMPOSE_GID?}
volumes: volumes:
- ./volumes/broker_data/:/data/ - ./volumes/redis_data/:/data/
networks: networks:
reverse-proxy: reverse-proxy:
external: true external: true

View File

@@ -12,35 +12,42 @@ services:
- smtp-server - smtp-server
- default - default
depends_on: depends_on:
- immich_redis - immich-redis
- immich_postgres - immich-postgres
environment: environment:
REDIS_HOSTNAME: immich-redis
DB_HOSTNAME: immich-postgres
DB_USERNAME: postgres DB_USERNAME: postgres
DB_PASSWORD: postgres DB_PASSWORD: postgres
DB_DATABASE_NAME: immich DB_DATABASE_NAME: immich
volumes: volumes:
- ${NASCOMPOSE_DATA?}/media/photos/:/usr/src/app/upload/ - ${NASCOMPOSE_DATA?}/media/photos/:/usr/src/app/upload/
immich-machine-learning: immich-ml:
extends: extends:
file: ../compose.base.yaml file: ../compose.base.yaml
service: base-service service: base-service
hostname: immich-machine-learning container_name: immich-ml
image: ghcr.io/immich-app/immich-machine-learning:release image: ghcr.io/immich-app/immich-machine-learning:release
user: ${NASCOMPOSE_UID?}:${NASCOMPOSE_GID?}
volumes: volumes:
- ./volumes/immich_ml_cache/:/cache/ - ./volumes/immich_ml_cache/:/cache/
immich_redis: - ./volumes/immich_ml_config/:/.config/
immich-redis:
extends: extends:
file: ../compose.base.yaml file: ../compose.base.yaml
service: base-service service: base-service
hostname: redis container_name: immich-redis
image: redis:6.2-alpine image: redis:6.2-alpine
healthcheck: healthcheck:
test: redis-cli ping || exit 1 test: redis-cli ping || exit 1
immich_postgres: user: ${NASCOMPOSE_UID?}:${NASCOMPOSE_GID?}
volumes:
- ./volumes/redis_data/:/data/
immich-postgres:
extends: extends:
file: ../compose.base.yaml file: ../compose.base.yaml
service: base-service service: base-service
hostname: database container_name: immich-postgres
image: tensorchord/pgvecto-rs:pg14-v0.2.0 image: tensorchord/pgvecto-rs:pg14-v0.2.0
user: ${NASCOMPOSE_UID?}:${NASCOMPOSE_GID?} user: ${NASCOMPOSE_UID?}:${NASCOMPOSE_GID?}
environment: environment: