From f820a7b683d49a6394bcf66db87e1df31104f189 Mon Sep 17 00:00:00 2001 From: ralksta Date: Fri, 29 May 2026 17:33:19 +0200 Subject: [PATCH] fix: use docker-compose.override.yml for server-specific config - Remove :ro and network: host from base docker-compose.yml - Add docker-compose.override.yml.example with network/healthcheck template - Add docker-compose.override.yml to .gitignore This allows git pull without conflicts on the server. Server-specific settings (external networks, healthchecks) go in the override file. --- .gitignore | 1 + docker-compose.override.yml.example | 21 +++++++++++++++++++++ docker-compose.yml | 1 - 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 docker-compose.override.yml.example diff --git a/.gitignore b/.gitignore index a555831..f084375 100644 --- a/.gitignore +++ b/.gitignore @@ -53,6 +53,7 @@ Thumbs.db # ── Deployment ─────────────────────────────────────── .vercel +docker-compose.override.yml # ── User Content (personal gallery config) ─────────── content/settings.yaml diff --git a/docker-compose.override.yml.example b/docker-compose.override.yml.example new file mode 100644 index 0000000..b9c5067 --- /dev/null +++ b/docker-compose.override.yml.example @@ -0,0 +1,21 @@ +# Copy this file to docker-compose.override.yml and adjust for your server. +# This file is git-ignored — your local changes won't conflict with pulls. +# +# Example: add external network, healthcheck, or other server-specific settings. + +services: + lightbox: + networks: + - default + - immich_network + healthcheck: + test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://127.0.0.1:7211/"] + interval: 30s + timeout: 10s + retries: 3 + start_period: 30s + +networks: + immich_network: + external: true + name: immich-app_default diff --git a/docker-compose.yml b/docker-compose.yml index 8449a7a..e04c5b3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,6 @@ services: lightbox: build: context: . - network: host container_name: immich-folio restart: unless-stopped ports: