Replace individual paths with data

docker-compose.dev.raw

@@ -24,7 +24,7 @@ services:
     container_name: __proxy_name__
     volumes:
       - ${myPhotos}:/data
-      - ${proMedia}:/protected_media
+      - ${data}/protected_media:/protected_media
       - ./proxy/nginx.conf:/etc/nginx/nginx.conf:ro
 
   __frontend_name__:
@@ -52,10 +52,10 @@ services:
     container_name: __backend_name__
     volumes:
       - ${myPhotos}:/data
-      - ${proMedia}:/protected_media
-      - ${logLocation}:/logs
+      - ${data}/protected_media:/protected_media
+      - ${data}/logs:/logs
+      - ${data}/cache:/root/.cache
       - ${codedir}/librephotos:/code
-      - ${cachedir}:/root/.cache
       - ./vscode/server-extensions:/root/.vscode-server/extensions
       - ./vscode/server-insiders-extensions:/root/.vscode-server-insiders/extensions
       - ./vscode/settings.json:/code/.vscode/settings.json

docker-compose.dev.yml

@@ -24,7 +24,7 @@ services:
     container_name: proxy
     volumes:
       - ${myPhotos}:/data
-      - ${proMedia}:/protected_media
+      - ${data}/protected_media:/protected_media
       - ./proxy/nginx.conf:/etc/nginx/nginx.conf:ro
 
   frontend:
@@ -52,10 +52,10 @@ services:
     container_name: backend
     volumes:
       - ${myPhotos}:/data
-      - ${proMedia}:/protected_media
-      - ${logLocation}:/logs
+      - ${data}/protected_media:/protected_media
+      - ${data}/logs:/logs
       - ${codedir}/librephotos:/code
-      - ${cachedir}:/root/.cache
+      - ${data}/cache:/root/.cache
       - ./vscode/server-extensions:/root/.vscode-server/extensions
       - ./vscode/server-insiders-extensions:/root/.vscode-server-insiders/extensions
       - ./vscode/settings.json:/code/.vscode/settings.json

docker-compose.raw

@@ -15,7 +15,7 @@ services:
     restart: unless-stopped
     volumes:
       - ${myPhotos}:/data
-      - ${proMedia}:/protected_media
+      - ${data}/protected_media:/protected_media
       - ./proxy/nginx.conf:/etc/nginx/nginx.conf:ro
     ports:
       - ${httpPort}:80
@@ -32,7 +32,7 @@ services:
       - POSTGRES_PASSWORD=${dbPass}
       - POSTGRES_DB=${dbName}
     volumes:
-      - ${dbLocation}:/var/lib/postgresql/data
+      - ${data}/db:/var/lib/postgresql/data
     command: postgres -c fsync=off -c synchronous_commit=off -c full_page_writes=off -c random_page_cost=1.0
 
   __frontend_name__:
@@ -48,9 +48,9 @@ services:
     restart: unless-stopped
     volumes:
       - ${myPhotos}:/data
-      - ${proMedia}:/protected_media
-      - ${logLocation}:/logs
-      - ${cachedir}:/root/.cache
+      - ${data}/protected_media:/protected_media
+      - ${data}/logs:/logs
+      - ${data}/cache:/root/.cache
 
     environment:
       - SECRET_KEY=${shhhhKey}

docker-compose.yml

@@ -15,7 +15,7 @@ services:
     restart: unless-stopped
     volumes:
       - ${myPhotos}:/data
-      - ${proMedia}:/protected_media
+      - ${data}/protected_media:/protected_media
     ports:
       - ${httpPort}:80
     depends_on:
@@ -31,7 +31,7 @@ services:
       - POSTGRES_PASSWORD=${dbPass}
       - POSTGRES_DB=${dbName}
     volumes:
-      - ${dbLocation}:/var/lib/postgresql/data
+      - ${data}/db:/var/lib/postgresql/data
     command: postgres -c fsync=off -c synchronous_commit=off -c full_page_writes=off -c random_page_cost=1.0
 
   frontend:
@@ -47,9 +47,9 @@ services:
     restart: unless-stopped
     volumes:
       - ${myPhotos}:/data
-      - ${proMedia}:/protected_media
-      - ${logLocation}:/logs
-      - ${cachedir}:/root/.cache
+      - ${data}/protected_media:/protected_media
+      - ${data}/logs:/logs
+      - ${data}/cache:/root/.cache
 
     environment:
       - SECRET_KEY=${shhhhKey}

librephotos.env

@@ -7,33 +7,28 @@
 # Location of your photos.
 myPhotos=./librephotos/pictures
 
-# The location where you would like to store the log files. The full path must exist as it will not be created for you. 
-logLocation=./librephotos/logs/
-
-# Protected media directory. This is where we store some files like the thumbnails of your images. 
-proMedia=./librephotos/media
-
-# Where shall we store the cache files. 
-cachedir=./librephotos/cache
-
-# Where shall we store the database. 
-dbLocation=./librephotos/data
+# Internal data of LibrePhotos
+data=./librephotos/data
 
 # Secret Key. Get one here https://rb.gy/emgmwo (Shortened random.org link)
 shhhhKey=D2VymuMn2gAhx4tmAawd
 
-#What port should Libre Photos be accessed at (Default 3000)
-httpPort=3000
 # ------------------------------------------------------------------------------------------------
 
 # Wow, we are at the optional now. Pretty easy so far. You do not have to change any of the below. 
 
-# 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
+#What port should Libre Photos be accessed at (Default 3000)
+httpPort=3000
 
 # What branch should we install the latest weekly build or the development branch (dev)
 tag=latest
 
+# Number of workers, which take care of the request to the api. This setting can dramatically affect the ram usage.
+# A positive integer generally in the 2-4 x $(NUM_CORES) range. 
+# You’ll want to vary this a bit to find the best for your particular workload.
+# Each worker needs 800MB of RAM. Change at your own will. Default is 2.
+gunniWorkers=2
+
 # You can set the database name. Did you know Libre Photos was forked from OwnPhotos?
 dbName=librephotos
 
@@ -43,16 +38,13 @@ dbUser=docker
 # The password used by the database.
 dbPass=AaAa1234
 
-# Number of workers, which take care of the request to the api. This setting can dramatically affect the ram usage.
-# A positive integer generally in the 2-4 x $(NUM_CORES) range. 
-# You’ll want to vary this a bit to find the best for your particular workload.
-# Each worker needs 800MB of RAM. Change at your own will. Default is 2.
-gunniWorkers=2
-
 # Default minimum rating to interpret as favorited. This default value is used when creating a new user.
 # Users can change this in their settings (Dashboards > Library).
 DEFAULT_FAVORITE_MIN_RATING=4
 
+# 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
+
 # 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.
 # Note that changing the DB_CONT_NAME will also need you to set the `dbHost` variable to the same value.