diff --git a/docker compositions/immich/docker-compose.upstream.yml b/docker compositions/immich/docker-compose.upstream.yml index 927a95f..4b8453c 100644 --- a/docker compositions/immich/docker-compose.upstream.yml +++ b/docker compositions/immich/docker-compose.upstream.yml @@ -22,7 +22,7 @@ services: env_file: - .env ports: - - 2283:3001 + - '2283:2283' depends_on: - redis - database @@ -48,7 +48,7 @@ services: redis: container_name: immich_redis - image: docker.io/redis:6.2-alpine@sha256:e3b17ba9479deec4b7d1eeec1548a253acc5374d68d3b27937fcfe4df8d18c7e + image: docker.io/redis:6.2-alpine@sha256:eaba718fecd1196d88533de7ba49bf903ad33664a92debb24660a922ecd9cac8 healthcheck: test: redis-cli ping || exit 1 restart: always @@ -65,11 +65,23 @@ services: # Do not edit the next line. If you want to change the database storage location on your system, edit the value of DB_DATA_LOCATION in the .env file - ${DB_DATA_LOCATION}:/var/lib/postgresql/data healthcheck: - test: pg_isready --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' || exit 1; Chksum="$$(psql --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' --tuples-only --no-align --command='SELECT COALESCE(SUM(checksum_failures), 0) FROM pg_stat_database')"; echo "checksum failure count is $$Chksum"; [ "$$Chksum" = '0' ] || exit 1 + test: >- + pg_isready --dbname="$${POSTGRES_DB}" --username="$${POSTGRES_USER}" || exit 1; + Chksum="$$(psql --dbname="$${POSTGRES_DB}" --username="$${POSTGRES_USER}" --tuples-only --no-align + --command='SELECT COALESCE(SUM(checksum_failures), 0) FROM pg_stat_database')"; + echo "checksum failure count is $$Chksum"; + [ "$$Chksum" = '0' ] || exit 1 interval: 5m start_interval: 30s start_period: 5m - command: ["postgres", "-c", "shared_preload_libraries=vectors.so", "-c", 'search_path="$$user", public, vectors', "-c", "logging_collector=on", "-c", "max_wal_size=2GB", "-c", "shared_buffers=512MB", "-c", "wal_compression=on"] + command: >- + postgres + -c shared_preload_libraries=vectors.so + -c 'search_path="$$user", public, vectors' + -c logging_collector=on + -c max_wal_size=2GB + -c shared_buffers=512MB + -c wal_compression=on restart: always volumes: diff --git a/docker compositions/immich/docker-compose.yml b/docker compositions/immich/docker-compose.yml index 74fb856..a84d061 100644 --- a/docker compositions/immich/docker-compose.yml +++ b/docker compositions/immich/docker-compose.yml @@ -4,10 +4,8 @@ # Edit variables via .env file ### -name: immich services: immich-server: - container_name: immich_server image: ghcr.io/immich-app/immich-server:${IMMICH_VERSION:-release} extends: file: hwaccel.transcoding.yml @@ -18,7 +16,7 @@ services: env_file: - .env ports: - - 2283:3001 + - '2283:2283' depends_on: - redis - database @@ -27,7 +25,6 @@ services: disable: false immich-machine-learning: - container_name: immich_machine_learning-openvino image: ghcr.io/immich-app/immich-machine-learning:${IMMICH_VERSION:-release} extends: file: hwaccel.ml.yml @@ -41,14 +38,12 @@ services: disable: false redis: - container_name: immich_redis - image: docker.io/redis:6.2-alpine@sha256:e3b17ba9479deec4b7d1eeec1548a253acc5374d68d3b27937fcfe4df8d18c7e + image: docker.io/redis:6.2-alpine@sha256:eaba718fecd1196d88533de7ba49bf903ad33664a92debb24660a922ecd9cac8 healthcheck: test: redis-cli ping || exit 1 restart: unless-stopped database: - container_name: immich_postgres image: docker.io/tensorchord/pgvecto-rs:pg14-v0.2.0@sha256:90724186f0a3517cf6914295b5ab410db9ce23190a2d9d0b9dd6463e3fa298f0 environment: POSTGRES_PASSWORD: ${DB_PASSWORD}