Skip to content

High performance self-hosted photo and video management solution.

chore(deployment): cleanup database container args, move to using internal container ENV vars (#14352)

Matthew Momjian25488b313840
diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
index 0b14ea7d6a..5da5bd3f91 100644
--- a/docker/docker-compose.dev.yml
+++ b/docker/docker-compose.dev.yml
@@ -125,26 +125,23 @@ services:
ports:
- 5432:5432
healthcheck:
- 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
+ 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
- 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
# set IMMICH_TELEMETRY_INCLUDE=all in .env to enable metrics
# immich-prometheus:
diff --git a/docker/docker-compose.prod.yml b/docker/docker-compose.prod.yml
index 96e324f0d9..8d80003ee4 100644
--- a/docker/docker-compose.prod.yml
+++ b/docker/docker-compose.prod.yml
@@ -67,26 +67,23 @@ services:
ports:
- 5432:5432
healthcheck:
- 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
+ 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
- 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
restart: always
# set IMMICH_TELEMETRY_INCLUDE=all in .env to enable metrics
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 86ec637cbb..4b8453ce58 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -65,26 +65,23 @@ services:
# Do not edit the next line. If you want to change the database storage location on your system, edit the value of DB_DATA_LOCATION in the .env file
- ${DB_DATA_LOCATION}:/var/lib/postgresql/data
healthcheck:
- 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
+ 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
- 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
restart: always
volumes: