From 22af3b89a66d66c8ab41b6aecce18ec26b649d43 Mon Sep 17 00:00:00 2001
From: okxlin <okxlin@gmail.com>
Date: Mon, 17 Jun 2024 23:41:22 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=9B=B4=E6=96=B0immich=E5=88=B01.106.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/immich/{1.106.3 => 1.106.4}/.env.sample        |  0
 apps/immich/{1.106.3 => 1.106.4}/config.env         |  0
 apps/immich/{1.106.3 => 1.106.4}/data.yml           |  0
 apps/immich/{1.106.3 => 1.106.4}/docker-compose.yml | 13 ++++++++++---
 apps/immich/release/docker-compose.yml              |  7 +++++++
 5 files changed, 17 insertions(+), 3 deletions(-)
 rename apps/immich/{1.106.3 => 1.106.4}/.env.sample (100%)
 rename apps/immich/{1.106.3 => 1.106.4}/config.env (100%)
 rename apps/immich/{1.106.3 => 1.106.4}/data.yml (100%)
 rename apps/immich/{1.106.3 => 1.106.4}/docker-compose.yml (78%)

diff --git a/apps/immich/1.106.3/.env.sample b/apps/immich/1.106.4/.env.sample
similarity index 100%
rename from apps/immich/1.106.3/.env.sample
rename to apps/immich/1.106.4/.env.sample
diff --git a/apps/immich/1.106.3/config.env b/apps/immich/1.106.4/config.env
similarity index 100%
rename from apps/immich/1.106.3/config.env
rename to apps/immich/1.106.4/config.env
diff --git a/apps/immich/1.106.3/data.yml b/apps/immich/1.106.4/data.yml
similarity index 100%
rename from apps/immich/1.106.3/data.yml
rename to apps/immich/1.106.4/data.yml
diff --git a/apps/immich/1.106.3/docker-compose.yml b/apps/immich/1.106.4/docker-compose.yml
similarity index 78%
rename from apps/immich/1.106.3/docker-compose.yml
rename to apps/immich/1.106.4/docker-compose.yml
index e974fa31..a5c1c8ee 100644
--- a/apps/immich/1.106.3/docker-compose.yml
+++ b/apps/immich/1.106.4/docker-compose.yml
@@ -4,7 +4,7 @@ services:
     restart: always
     networks:
       - 1panel-network
-    image: altran1502/immich-server:v1.106.3
+    image: altran1502/immich-server:v1.106.4
     command: [ "start.sh", "immich" ]
     volumes:
       - ${UPLOAD_LOCATION}:/usr/src/app/upload
@@ -24,7 +24,7 @@ services:
     restart: always
     networks:
       - 1panel-network
-    image: altran1502/immich-server:v1.106.3
+    image: altran1502/immich-server:v1.106.4
     # extends:
     #   file: hwaccel.yml
     #   service: hwaccel
@@ -45,7 +45,7 @@ services:
     restart: always
     networks:
       - 1panel-network
-    image: altran1502/immich-machine-learning:v1.106.3
+    image: altran1502/immich-machine-learning:v1.106.4
     volumes:
       - ${CACHE_PATH}:/cache
     env_file:
@@ -59,6 +59,8 @@ services:
     networks:
       - 1panel-network
     image: "redis:6.2-alpine"
+    healthcheck:
+      test: redis-cli ping || exit 1
     labels:  
       createdBy: "Apps"
 
@@ -77,6 +79,11 @@ services:
       - POSTGRES_INITDB_ARGS=--data-checksums
     volumes:
       - ${DB_PATH}:/var/lib/postgresql/data
+    healthcheck:
+      test: pg_isready --dbname='${PANEL_DB_NAME}' || exit 1; Chksum="$$(psql --dbname='${PANEL_DB_NAME}' --username='${PANEL_DB_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"]
     labels:  
       createdBy: "Apps"
diff --git a/apps/immich/release/docker-compose.yml b/apps/immich/release/docker-compose.yml
index b7125fd0..fba44635 100644
--- a/apps/immich/release/docker-compose.yml
+++ b/apps/immich/release/docker-compose.yml
@@ -59,6 +59,8 @@ services:
     networks:
       - 1panel-network
     image: "redis:6.2-alpine"
+    healthcheck:
+      test: redis-cli ping || exit 1
     labels:  
       createdBy: "Apps"
 
@@ -77,6 +79,11 @@ services:
       - POSTGRES_INITDB_ARGS=--data-checksums
     volumes:
       - ${DB_PATH}:/var/lib/postgresql/data
+    healthcheck:
+      test: pg_isready --dbname='${PANEL_DB_NAME}' || exit 1; Chksum="$$(psql --dbname='${PANEL_DB_NAME}' --username='${PANEL_DB_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"]
     labels:  
       createdBy: "Apps"