diff --git a/apps/immich-machine-learning/1.118.1/docker-compose.yml b/apps/immich-machine-learning/1.118.1/docker-compose.yml index dc1c704a..055bb68d 100644 --- a/apps/immich-machine-learning/1.118.1/docker-compose.yml +++ b/apps/immich-machine-learning/1.118.1/docker-compose.yml @@ -29,3 +29,5 @@ services: - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${IMMICH_ROOT_PATH}/data/cache:/cache + healthcheck: + disable: false diff --git a/apps/immich-server/1.118.1/docker-compose.yml b/apps/immich-server/1.118.1/docker-compose.yml index 626d2d19..04bfe283 100644 --- a/apps/immich-server/1.118.1/docker-compose.yml +++ b/apps/immich-server/1.118.1/docker-compose.yml @@ -23,10 +23,12 @@ services: # - /dev/nvidia-uvm-tools:/dev/nvidia-uvm-tools # - /dev/video11:/dev/video11 ports: - - ${PANEL_APP_PORT_HTTP}:3001 + - ${PANEL_APP_PORT_HTTP}:2283 env_file: - /etc/1panel/envs/global.env - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${IMMICH_ROOT_PATH}/data/library:/usr/src/app/upload - /etc/localtime:/etc/localtime + healthcheck: + disable: false diff --git a/apps/immich/1.118.1/docker-compose.yml b/apps/immich/1.118.1/docker-compose.yml index ee557013..2c1b1d0d 100644 --- a/apps/immich/1.118.1/docker-compose.yml +++ b/apps/immich/1.118.1/docker-compose.yml @@ -18,42 +18,32 @@ services: volumes: - ${IMMICH_ROOT_PATH}/pg14/data:/var/lib/postgresql/data healthcheck: - test: pg_isready --dbname='${DB_DATABASE_NAME}' || 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='${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 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', + ] environment: POSTGRES_PASSWORD: ${DB_PASSWORD} POSTGRES_USER: ${DB_USERNAME:-postgres} POSTGRES_DB: ${DB_DATABASE_NAME:-immich} POSTGRES_INITDB_ARGS: '--data-checksums' - immich-machine-learning: - image: ghcr.io/immich-app/immich-machine-learning:v1.118.1 - container_name: immich-machine-learning-${CONTAINER_NAME} - labels: - createdBy: "Apps" - restart: always - networks: - - 1panel-network - devices: - - /dev/dri:/dev/dri - # - /dev/nvidia0:/dev/nvidia0 - # - /dev/nvidiactl:/dev/nvidiactl - # - /dev/nvidia-modeset:/dev/nvidia-modeset - # - /dev/nvidia-nvswitchctl:/dev/nvidia-nvswitchctl - # - /dev/nvidia-uvm:/dev/nvidia-uvm - # - /dev/nvidia-uvm-tools:/dev/nvidia-uvm-tools - # - /dev/video11:/dev/video11 - ports: - - ${PANEL_APP_PORT_MACHINE_LEARNING}:3003 - env_file: - - /etc/1panel/envs/global.env - - ${ENV_FILE:-/etc/1panel/envs/default.env} - volumes: - - ${IMMICH_ROOT_PATH}/data/cache:/cache - immich-server: depends_on: - immich-pg14-vectors @@ -64,7 +54,7 @@ services: restart: always networks: - 1panel-network - devices: + devices: &default_devices - /dev/dri:/dev/dri # - /dev/nvidia0:/dev/nvidia0 # - /dev/nvidiactl:/dev/nvidiactl @@ -74,10 +64,32 @@ services: # - /dev/nvidia-uvm-tools:/dev/nvidia-uvm-tools # - /dev/video11:/dev/video11 ports: - - ${PANEL_APP_PORT_HTTP}:3001 + - ${PANEL_APP_PORT_HTTP}:2283 env_file: - /etc/1panel/envs/global.env - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${IMMICH_ROOT_PATH}/data/library:/usr/src/app/upload - /etc/localtime:/etc/localtime + healthcheck: + disable: false + + immich-machine-learning: + image: ghcr.io/immich-app/immich-machine-learning:v1.118.1 + container_name: immich-machine-learning-${CONTAINER_NAME} + labels: + createdBy: "Apps" + restart: always + networks: + - 1panel-network + devices: + <<: *default_devices + ports: + - ${PANEL_APP_PORT_MACHINE_LEARNING}:3003 + env_file: + - /etc/1panel/envs/global.env + - ${ENV_FILE:-/etc/1panel/envs/default.env} + volumes: + - ${IMMICH_ROOT_PATH}/data/cache:/cache + healthcheck: + disable: false