From 224ecc3f96c5e5f4c91e5df192acb483e72d33ec Mon Sep 17 00:00:00 2001 From: Adrien Poupa Date: Sun, 17 Nov 2024 23:47:40 -0500 Subject: [PATCH 1/2] chore: Update Immich to 120.2 --- immich/docker-compose.yml | 39 +++++++++++++++++-------------- immich/healthcheck/healthcheck.js | 28 ---------------------- 2 files changed, 21 insertions(+), 46 deletions(-) delete mode 100644 immich/healthcheck/healthcheck.js diff --git a/immich/docker-compose.yml b/immich/docker-compose.yml index b508853..0a22fc9 100644 --- a/immich/docker-compose.yml +++ b/immich/docker-compose.yml @@ -1,7 +1,7 @@ services: immich-server: container_name: immich_server - image: ghcr.io/immich-app/immich-server:v1.113.0 + image: ghcr.io/immich-app/immich-server:v1.120.2 environment: DB_HOSTNAME: immich_postgres DB_PASSWORD: ${IMMICH_DB_PASSWORD} @@ -16,16 +16,12 @@ services: - immich-redis - immich-database restart: always - healthcheck: - test: [ "CMD", "node", "/healthcheck/healthcheck.js" ] - interval: 30s - retries: 10 labels: - traefik.enable=true - traefik.http.routers.immich.rule=(Host(`${IMMICH_HOSTNAME}`)) - traefik.http.routers.immich.tls=true - traefik.http.routers.immich.tls.certresolver=myresolver - - traefik.http.services.immich.loadbalancer.server.port=3001 + - traefik.http.services.immich.loadbalancer.server.port=2283 - homepage.group=Apps - homepage.name=immich - homepage.icon=immich.png @@ -33,22 +29,17 @@ services: - homepage.description=Self-hosted photo and video management solution - homepage.weight=4 - homepage.widget.type=immich - - homepage.widget.url=http://immich-server:3001 + - homepage.widget.url=http://immich-server:2283 - homepage.widget.key=${IMMICH_API_KEY} profiles: - immich immich-machine-learning: container_name: immich_machine_learning - image: ghcr.io/immich-app/immich-machine-learning:v1.113.0 + image: ghcr.io/immich-app/immich-machine-learning:v1.120.2 volumes: - immich-model-cache:/cache restart: always - healthcheck: - test: [ "CMD", "bash", "-c", "exec 5<>/dev/tcp/127.0.0.1/3003" ] - interval: 10s - timeout: 5s - retries: 5 profiles: - immich @@ -57,10 +48,7 @@ services: image: registry.hub.docker.com/library/redis:6.2-alpine@sha256:e3b17ba9479deec4b7d1eeec1548a253acc5374d68d3b27937fcfe4df8d18c7e restart: always healthcheck: - test: [ "CMD", "redis-cli", "ping" ] - interval: 10s - timeout: 5s - retries: 5 + test: redis-cli ping || exit 1 profiles: - immich @@ -80,7 +68,22 @@ services: 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', + ] profiles: - immich diff --git a/immich/healthcheck/healthcheck.js b/immich/healthcheck/healthcheck.js deleted file mode 100644 index 0e627ea..0000000 --- a/immich/healthcheck/healthcheck.js +++ /dev/null @@ -1,28 +0,0 @@ -// Inspired by: https://anthonymineo.com/docker-healthcheck-for-your-node-js-app/ -const http = require('http'); -const options = { - host: '127.0.0.1', - port: 3001, - timeout: 2000, - path: '/api/server-info/ping', - headers: { - 'Host': process.env.HOSTNAME, - } -}; - -const healthCheck = http.request(options, (res) => { - console.log(`HEALTHCHECK STATUS: ${res.statusCode}`); - if (res.statusCode === 200) { - process.exit(0); - } - else { - process.exit(1); - } -}); - -healthCheck.on('error', function (err) { - console.error('ERROR:' + err); - process.exit(1); -}); - -healthCheck.end(); From e9819736d69717952b7d254d5d71a61fa76bd172 Mon Sep 17 00:00:00 2001 From: Adrien Poupa Date: Sun, 17 Nov 2024 23:55:32 -0500 Subject: [PATCH 2/2] fix(homepage): Fix Immich integration --- immich/docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/immich/docker-compose.yml b/immich/docker-compose.yml index 0a22fc9..4bddc99 100644 --- a/immich/docker-compose.yml +++ b/immich/docker-compose.yml @@ -23,7 +23,7 @@ services: - traefik.http.routers.immich.tls.certresolver=myresolver - traefik.http.services.immich.loadbalancer.server.port=2283 - homepage.group=Apps - - homepage.name=immich + - homepage.name=Immich - homepage.icon=immich.png - homepage.href=https://${IMMICH_HOSTNAME} - homepage.description=Self-hosted photo and video management solution @@ -31,6 +31,7 @@ services: - homepage.widget.type=immich - homepage.widget.url=http://immich-server:2283 - homepage.widget.key=${IMMICH_API_KEY} + - homepage.widget.version=2 profiles: - immich