From a7e773d36967faaff86c6b491e5dbd9ebdabe226 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 27 Jan 2025 11:00:08 -0500 Subject: [PATCH 1/2] Adding InfluxDB service and removing Yacht. --- docker-compose.yml | 189 +++++++++++++++++++++++---------------------- 1 file changed, 97 insertions(+), 92 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 56e1566a..faa07c42 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1975,6 +1975,99 @@ services: type: bind bind: create_host_path: true + immich-server: + container_name: immich_server + depends_on: + redis: + condition: service_started + required: true + immich-pg-db: + condition: service_started + required: true + environment: + DB_DATABASE_NAME: immich + DB_USERNAME: immich + DB_PASSWORD: ${IMMICH_DB_PASSWORD} + IMMICH_TELEMETRY_INCLUDE: all + healthcheck: + disable: false + image: ghcr.io/immich-app/immich-server:release + ports: + - 2283:2283 + restart: always + volumes: + # Do not edit the next line. If you want to change the media storage location on your system, edit the value of UPLOAD_LOCATION in the .env file + - ${DOCKER_VOLUME_STORAGE}/Pics:/usr/src/app/upload + - /etc/localtime:/etc/localtime:ro + immich-machine-learning: + container_name: immich_machine_learning + depends_on: + immich-server: + condition: service_started + required: true + healthcheck: + disable: false + image: ghcr.io/immich-app/immich-machine-learning:release + restart: always + volumes: + - immich-model-cache:/cache + immich-pg-db: + 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 + container_name: immich-pg-db + environment: + POSTGRES_PASSWORD: ${JOPLIN_POSTGRES_PASSWORD} + POSTGRES_USER: immich + POSTGRES_DB: immich + expose: + - 5432 + healthcheck: + 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 + image: tensorchord/pgvecto-rs:pg14-v0.2.1 + restart: unless-stopped + volumes: + - ${DOCKER_VOLUME_CONFIG}/immich/db:/var/lib/postgresql/data + influxdb2: + container_name: influxdb2 + environment: + DOCKER_INFLUXDB_INIT_MODE: setup + DOCKER_INFLUXDB_INIT_USERNAME: admin + DOCKER_INFLUXDB_INIT_PASSWORD: ${INFLUXDB2_ADMIN_PASSWORD} + DOCKER_INFLUXDB_INIT_ADMIN_TOKEN: /run/secrets/influxdb2-admin-token + DOCKER_INFLUXDB_INIT_ORG: rinoa + DOCKER_INFLUXDB_INIT_BUCKET: rinoa + image: influxdb:2-alpine + labels: + homepage: enable + homepage_proto: http + homepage_port: 8086 + homepage_url: influxdb.${MY_TLD} + homepage.uptime-kuma.enabled: true + homepage.uptime-kuma.monitor.url: https://influxdb.${MY_TLD} + homepage.group: System Administration + homepage.name: InfluxDBv2 + homepage.href: https://invid.${MY_TLD} + homepage.icon: influxdb.svg + homepage.description: Scalable datastore for metrics, events, and real-time analytics + ports: + - 8086:8086 + volumes: + - influxdb2-data:/var/lib/influxdb2 + - influxdb2-config:/etc/influxdb2 invidious: container_name: invidious depends_on: @@ -2184,72 +2277,6 @@ services: type: bind bind: create_host_path: true - immich-server: - container_name: immich_server - depends_on: - redis: - condition: service_started - required: true - immich-pg-db: - condition: service_started - required: true - environment: - DB_DATABASE_NAME: immich - DB_USERNAME: immich - DB_PASSWORD: ${IMMICH_DB_PASSWORD} - IMMICH_TELEMETRY_INCLUDE: all - healthcheck: - disable: false - image: ghcr.io/immich-app/immich-server:release - ports: - - 2283:2283 - restart: always - volumes: - # Do not edit the next line. If you want to change the media storage location on your system, edit the value of UPLOAD_LOCATION in the .env file - - ${DOCKER_VOLUME_STORAGE}/Pics:/usr/src/app/upload - - /etc/localtime:/etc/localtime:ro - immich-machine-learning: - container_name: immich_machine_learning - depends_on: - immich-server: - condition: service_started - required: true - healthcheck: - disable: false - image: ghcr.io/immich-app/immich-machine-learning:release - restart: always - volumes: - - immich-model-cache:/cache - immich-pg-db: - 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 - container_name: immich-pg-db - environment: - POSTGRES_PASSWORD: ${JOPLIN_POSTGRES_PASSWORD} - POSTGRES_USER: immich - POSTGRES_DB: immich - expose: - - 5432 - healthcheck: - 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 - image: tensorchord/pgvecto-rs:pg14-v0.2.1 - restart: unless-stopped - volumes: - - ${DOCKER_VOLUME_CONFIG}/immich/db:/var/lib/postgresql/data it-tools: container_name: it-tools image: ghcr.io/corentinth/it-tools:latest @@ -6916,32 +6943,6 @@ services: published: "3010" target: 3000 restart: unless-stopped - yacht: - container_name: yacht - depends_on: - docker-socket-proxy: - condition: service_started - required: true - environment: - DOCKER_HOST: tcp://dockerproxy:2375 - image: selfhostedpro/yacht - labels: - homepage.group: System Administration - homepage.name: Yacht - homepage.href: https://yacht.${MY_TLD} - homepage.icon: yacht.svg - homepage.description: Web interface for managing docker containers - swag: enable - swag_proto: http - swag_port: 8000 - swag_url: yacht.${MY_TLD} - swag.uptime-kuma.enabled: true - swag.uptime-kuma.monitor.url: https://yacht.${MY_TLD} - ports: - - 19733:8000 - restart: unless-stopped - volumes: - - ${DOCKER_VOLUME_CONFIG}/yacht:/config your_spotify: container_name: your_spotify environment: @@ -7468,6 +7469,10 @@ volumes: name: hortusfox_db_data immich-model-cache: name: immich-model-cache + influxdb2-data: + name: influxdb2-data + influxdb2-config: + name: influxdb2-config invidious-postgres: name: invidious-postgres invoice_ninja_public: From c0d8e1a3e15d4c2c0a81e591a1378a8f492593d5 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 27 Jan 2025 16:10:34 +0000 Subject: [PATCH 2/2] chore: Update README --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 522612df..ba7576b5 100644 --- a/README.md +++ b/README.md @@ -53,13 +53,14 @@ | homepage | ghcr.io/gethomepage/homepage:latest | | hortusfox | ghcr.io/danielbrendel/hortusfox-web:latest | | hugo | hugomods/hugo:exts | +| immich-server | ghcr.io/immich-app/immich-server:release | +| immich-machine-learning | ghcr.io/immich-app/immich-machine-learning:release | +| immich-pg-db | tensorchord/pgvecto-rs:pg14-v0.2.1 | +| influxdb2 | influxdb:2-alpine | | invidious | quay.io/invidious/invidious:latest | | invidious-db | docker.io/library/postgres:14 | | invoice_ninja | invoiceninja/invoiceninja:5 | | invoice_ninja_proxy | nginx | -| immich-server | ghcr.io/immich-app/immich-server:release | -| immich-machine-learning | ghcr.io/immich-app/immich-machine-learning:release | -| immich-pg-db | tensorchord/pgvecto-rs:pg14-v0.2.1 | | it-tools | ghcr.io/corentinth/it-tools:latest | | jellyfin | jellyfin/jellyfin | | jitsi-etherpad | etherpad/etherpad:1.8.6 | @@ -149,7 +150,6 @@ | wazuh.indexer | wazuh/wazuh-indexer: | | wazuh.manager | wazuh/wazuh-manager: | | web-check | lissy93/web-check | -| yacht | selfhostedpro/yacht | | your_spotify | lscr.io/linuxserver/your_spotify:latest | | youtubedl | nbr23/youtube-dl-server:latest | | zammad-backup | postgres: |