works locally, little difference against original
This commit is contained in:
parent
b58261728c
commit
5587b6cd62
3 changed files with 26 additions and 40 deletions
|
|
@ -1,3 +1,14 @@
|
||||||
|
#
|
||||||
|
# WARNING: To install Immich, follow our guide: https://immich.app/docs/install/docker-compose
|
||||||
|
#
|
||||||
|
# Make sure to use the docker-compose.yml of the current release:
|
||||||
|
#
|
||||||
|
# https://github.com/immich-app/immich/releases/latest/download/docker-compose.yml
|
||||||
|
#
|
||||||
|
# The compose file on main may not be compatible with the latest release.
|
||||||
|
|
||||||
|
name: immich
|
||||||
|
|
||||||
services:
|
services:
|
||||||
ts-immich:
|
ts-immich:
|
||||||
image: tailscale/tailscale:latest
|
image: tailscale/tailscale:latest
|
||||||
|
|
@ -18,10 +29,9 @@ services:
|
||||||
configs:
|
configs:
|
||||||
- source: serve-config
|
- source: serve-config
|
||||||
target: /ts/serve.json
|
target: /ts/serve.json
|
||||||
networks:
|
|
||||||
- ts_immich_net
|
|
||||||
immich-server:
|
immich-server:
|
||||||
container_name: immich_server
|
container_name: immich_server
|
||||||
|
network_mode: service:ts-immich
|
||||||
image: ghcr.io/immich-app/immich-server:${IMMICH_VERSION:-release}
|
image: ghcr.io/immich-app/immich-server:${IMMICH_VERSION:-release}
|
||||||
# extends:
|
# extends:
|
||||||
# file: hwaccel.transcoding.yml
|
# file: hwaccel.transcoding.yml
|
||||||
|
|
@ -31,19 +41,16 @@ services:
|
||||||
- ${UPLOAD_LOCATION}:/data
|
- ${UPLOAD_LOCATION}:/data
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
env_file:
|
env_file:
|
||||||
- immich.env
|
- .env
|
||||||
ports:
|
#ports:
|
||||||
- '2283:2283'
|
# - '2283:2283'
|
||||||
depends_on:
|
depends_on:
|
||||||
- redis
|
- redis
|
||||||
- database
|
- database
|
||||||
- ts-immich
|
restart: always
|
||||||
restart: on-failure:1
|
|
||||||
healthcheck:
|
healthcheck:
|
||||||
disable: false
|
disable: false
|
||||||
networks:
|
|
||||||
- immich_default
|
|
||||||
- ts_immich_net
|
|
||||||
immich-machine-learning:
|
immich-machine-learning:
|
||||||
container_name: immich_machine_learning
|
container_name: immich_machine_learning
|
||||||
# For hardware acceleration, add one of -[armnn, cuda, rocm, openvino, rknn] to the image tag.
|
# For hardware acceleration, add one of -[armnn, cuda, rocm, openvino, rknn] to the image tag.
|
||||||
|
|
@ -55,20 +62,18 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- model-cache:/cache
|
- model-cache:/cache
|
||||||
env_file:
|
env_file:
|
||||||
- immich.env
|
- .env
|
||||||
restart: always
|
restart: always
|
||||||
healthcheck:
|
healthcheck:
|
||||||
disable: false
|
disable: false
|
||||||
networks:
|
|
||||||
- immich_default
|
|
||||||
redis:
|
redis:
|
||||||
container_name: immich_redis
|
container_name: immich_redis
|
||||||
image: docker.io/valkey/valkey:8-bookworm@sha256:facc1d2c3462975c34e10fccb167bfa92b0e0dbd992fc282c29a61c3243afb11
|
image: docker.io/valkey/valkey:8-bookworm@sha256:facc1d2c3462975c34e10fccb167bfa92b0e0dbd992fc282c29a61c3243afb11
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: redis-cli ping || exit 1
|
test: redis-cli ping || exit 1
|
||||||
restart: always
|
restart: always
|
||||||
networks:
|
|
||||||
- immich_default
|
|
||||||
database:
|
database:
|
||||||
container_name: immich_postgres
|
container_name: immich_postgres
|
||||||
image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3-pgvectors0.2.0@sha256:32324a2f41df5de9efe1af166b7008c3f55646f8d0e00d9550c16c9822366b4a
|
image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3-pgvectors0.2.0@sha256:32324a2f41df5de9efe1af166b7008c3f55646f8d0e00d9550c16c9822366b4a
|
||||||
|
|
@ -84,16 +89,10 @@ services:
|
||||||
- ${DB_DATA_LOCATION}:/var/lib/postgresql/data
|
- ${DB_DATA_LOCATION}:/var/lib/postgresql/data
|
||||||
shm_size: 128mb
|
shm_size: 128mb
|
||||||
restart: always
|
restart: always
|
||||||
networks:
|
|
||||||
- immich_default
|
|
||||||
volumes:
|
volumes:
|
||||||
model-cache:
|
model-cache:
|
||||||
tailscale:
|
tailscale:
|
||||||
networks:
|
|
||||||
ts_immich_net:
|
|
||||||
driver: bridge
|
|
||||||
immich_default:
|
|
||||||
driver: bridge
|
|
||||||
configs:
|
configs:
|
||||||
serve-config:
|
serve-config:
|
||||||
content: |
|
content: |
|
||||||
|
|
@ -107,7 +106,7 @@ configs:
|
||||||
"$${TS_CERT_DOMAIN}:443": {
|
"$${TS_CERT_DOMAIN}:443": {
|
||||||
"Handlers": {
|
"Handlers": {
|
||||||
"/": {
|
"/": {
|
||||||
"Proxy": "http://immich-server:2283"
|
"Proxy": "http://127.0.0.1:2283"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,13 @@
|
||||||
TS_HOSTNAME=immich
|
TS_HOSTNAME=immich
|
||||||
TS_AUTHKEY=tskey-client-nnn-nnn # Change required
|
TS_AUTHKEY=tskey-client-nnn
|
||||||
TS_EXTRA_ARGS=--advertise-tags=tag:container
|
TS_EXTRA_ARGS=--advertise-tags=tag:container
|
||||||
TS_ALLOW_FUNNEL=false
|
TS_ALLOW_FUNNEL=false
|
||||||
|
BASE_DATA_DIR=.
|
||||||
BASE_DATA_DIR=${BASE_DATA_DIR:-.} # If desired, change data store location
|
|
||||||
#REPO_PREFIX=${REPO_PREFIX:-immich/}
|
|
||||||
|
|
||||||
# You can find documentation for all the supported env variables at
|
# You can find documentation for all the supported env variables at
|
||||||
# https://immich.app/docs/install/environment-variables
|
# https://immich.app/docs/install/environment-variables
|
||||||
UPLOAD_LOCATION=${BASE_DATA_DIR}/immich-data/library
|
UPLOAD_LOCATION=${BASE_DATA_DIR:-.}/immich-data/library
|
||||||
DB_DATA_LOCATION=${BASE_DATA_DIR}/immich-data/postgres
|
DB_DATA_LOCATION=${BASE_DATA_DIR:-.}/immich-data/postgres
|
||||||
# TZ=Etc/UTC
|
# TZ=Etc/UTC
|
||||||
IMMICH_VERSION=release
|
IMMICH_VERSION=release
|
||||||
DB_PASSWORD=postgres
|
DB_PASSWORD=postgres
|
||||||
|
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
BASE_DATA_DIR=${BASE_DATA_DIR:-.} # If desired, change data store location
|
|
||||||
|
|
||||||
# You can find documentation for all the supported env variables at
|
|
||||||
# https://immich.app/docs/install/environment-variables
|
|
||||||
UPLOAD_LOCATION=${BASE_DATA_DIR}/immich-data/library
|
|
||||||
DB_DATA_LOCATION=${BASE_DATA_DIR}/immich-data/postgres
|
|
||||||
# TZ=Etc/UTC
|
|
||||||
IMMICH_VERSION=release
|
|
||||||
DB_PASSWORD=postgres
|
|
||||||
DB_USERNAME=postgres
|
|
||||||
DB_DATABASE_NAME=immich
|
|
||||||
Loading…
Reference in a new issue