Restored the 'dbHost' variable and renamed the container names to end in...

Restored the 'dbHost' variable and renamed the container names to end in '_CONT_NAME' rather than '_HOST'. Also added a note in the '.env' file that the dbHost and DB_CONT_NAME variables must match if you want to use the renamed DB container.

Makefile

@@ -2,7 +2,7 @@
 
 include librephotos.env
 DOCKER_TAG ?= ownphotos-backend
-REPLACE_NAMES=sed 's/__backend_name__/$(BACKEND_HOST)/g; s/__frontend_name__/$(FRONTEND_HOST)/g; s/__proxy_name__/$(PROXY_HOST)/g; s/__redis_name__/$(REDIS_HOST)/g; s/__db_name__/$(DB_HOST)/g; s/__pgadmin_name__/$(PGADMIN_HOST)/g'
+REPLACE_NAMES=sed 's/__backend_name__/$(BACKEND_CONT_NAME)/g; s/__frontend_name__/$(FRONTEND_CONT_NAME)/g; s/__proxy_name__/$(PROXY_CONT_NAME)/g; s/__redis_name__/$(REDIS_CONT_NAME)/g; s/__db_name__/$(DB_CONT_NAME)/g; s/__pgadmin_name__/$(PGADMIN_CONT_NAME)/g'
 
 default: build
 

docker-compose.raw

@@ -58,7 +58,7 @@ services:
       - DB_NAME=${dbName}
       - DB_USER=${dbUser}
       - DB_PASS=${dbPass}
-      - DB_HOST=${DB_HOST}
+      - DB_HOST=${dbHost}
       - DB_PORT=5432
       - REDIS_HOST=__redis_name__
       - REDIS_PORT=6379

librephotos.env

@@ -31,6 +31,9 @@ userPass=admin
 # Email for the administrative user.
 adminEmail=admin@example.com
 
+# Database host. Only change this if you want to use your own existing Postgres server. If using your own server, you can remove the 'db' container from docker-compose.yml. If you're changing the name of the DB's container name (DB_CONT_NAME further down), you need to set this variable to match that name too.
+dbHost=db
+
 # Allow uploading files
 allowUpload=true
 
@@ -76,12 +79,13 @@ DEFAULT_FAVORITE_MIN_RATING=4
 
 # Set the names of the docker containers to your own entries. Or don't, I'm not your dad.
 # Changing these will require you to `make rename` to rename the services, and start the system with your chosen `docker-compose up -d` invocation again.
-BACKEND_HOST=backend
-FRONTEND_HOST=frontend
-PROXY_HOST=proxy
-REDIS_HOST=redis
-DB_HOST=db
-PGADMIN_HOST=pgadmin
+# Note that changing the DB_CONT_NAME will also need you to set the `dbHost` variable to the same value.
+DB_CONT_NAME=db
+BACKEND_CONT_NAME=backend
+FRONTEND_CONT_NAME=frontend
+PROXY_CONT_NAME=proxy
+REDIS_CONT_NAME=redis
+PGADMIN_CONT_NAME=pgadmin
 
 # ---------------------------------------------------------------------------------------------