From a38373753521efd77e907daf7cd9bb14a956ca30 Mon Sep 17 00:00:00 2001
From: Rishi Ghan <rishi.ghan@gmail.com>
Date: Wed, 3 Nov 2021 12:58:00 -0700
Subject: [PATCH] =?UTF-8?q?=F0=9F=92=BF=20Volume=20mapping=20in=20docker-c?=
 =?UTF-8?q?ompose=20configuration?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml                     | 34 +++++++++++---------------
 docker-env/comicvine-service.env       |  3 ++-
 docker-env/threetwo-import-service.env |  2 ++
 3 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index b4796d7..9840b3b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,8 +9,8 @@ services:
     env_file: ./docker-env/docker-compose.env
     restart: unless-stopped
     volumes:
-      - comics:/comics
-      - userdata:/userdata
+      - ${COMICS_DIRECTORY}:/comics
+      - ${USERDATA_DIRECTORY}:/userdata
     ports:
       - "8050:8050"
       - "3050:3050"
@@ -35,8 +35,8 @@ services:
     ports:
       - "3080:3080"
     volumes:
-      - comics:/comicvine-service/comics
-      - userdata:/comicvine-service/userdata
+      - ${COMICS_DIRECTORY}:/comicvine-service/comics
+      - ${USERDATA_DIRECTORY}:/comicvine-service/userdata
     environment:
       SERVICES: api
     env_file: ./docker-env/comicvine-service.env
@@ -53,8 +53,8 @@ services:
     environment:
       SERVICES: comicvine 
     volumes:
-      - comics:/comicvine-service/comics
-      - userdata:/comicvine-service/userdata
+      - ${COMICS_DIRECTORY}:/comicvine-service/comics
+      - ${USERDATA_DIRECTORY}:/comicvine-service/userdata
     env_file: ./docker-env/comicvine-service.env
     networks:
       - proxy
@@ -71,8 +71,8 @@ services:
       SERVICES: api
     env_file: ./docker-env/threetwo-import-service.env
     volumes:
-      - "userdata:/threetwo-import-service/userdata"
-      - "comics:/threetwo-import-service/comics"
+      - ${USERDATA_DIRECTORY}:/threetwo-import-service/userdata
+      - ${COMICS_DIRECTORY}:/threetwo-import-service/comics
     depends_on:
       - nats
       - db
@@ -90,8 +90,8 @@ services:
     environment:
       SERVICES: import 
     volumes:
-      - userdata:/threetwo-import-service/userdata
-      - comics:/threetwo-import-service/comics
+      - ${USERDATA_DIRECTORY}:/threetwo-import-service/userdata
+      - ${COMICS_DIRECTORY}:/threetwo-import-service/comics
     env_file: ./docker-env/threetwo-import-service.env
     networks:
       - proxy
@@ -102,8 +102,8 @@ services:
     image: frishi/threetwo-import-service
     container_name: image-transformation
     volumes:
-      - userdata:/threetwo-import-service/userdata
-      - comics:/threetwo-import-service/comics
+      - ${USERDATA_DIRECTORY}:/threetwo-import-service/userdata
+      - ${COMICS_DIRECTORY}:/threetwo-import-service/comics
     depends_on: 
       - db 
       - nats
@@ -119,8 +119,8 @@ services:
     image: frishi/threetwo-import-service
     container_name: library-queue
     volumes:
-      - userdata:/threetwo-import-service/userdata
-      - comics:/threetwo-import-service/comics
+      - ${USERDATA_DIRECTORY}:/threetwo-import-service/userdata
+      - ${COMICS_DIRECTORY}:/threetwo-import-service/comics
     depends_on: 
       - db 
       - nats
@@ -187,12 +187,6 @@ networks:
     external: true
 
 volumes:
-  comics:
-    name: ${COMICS_DIRECTORY}
-    external: false
-  userdata:
-    name: ${USERDATA_DIRECTORY}
-    external: false
   mongodb_data:
     driver: local
 
diff --git a/docker-env/comicvine-service.env b/docker-env/comicvine-service.env
index 369986d..87e0370 100644
--- a/docker-env/comicvine-service.env
+++ b/docker-env/comicvine-service.env
@@ -3,6 +3,7 @@ LOGLEVEL=info
 SERVICEDIR=dist/services
 PWD=./
 TRANSPORTER=nats://nats:4222
-
+COMICS_DIRECTORY=/mnt/unraidshare/directconnect/downloads/comics
+USERDATA_DIRECTORY=/mnt/unraidshare/directconnect/downloads/userdata
 CACHER=Memory
 
diff --git a/docker-env/threetwo-import-service.env b/docker-env/threetwo-import-service.env
index 544314b..5fcfd67 100644
--- a/docker-env/threetwo-import-service.env
+++ b/docker-env/threetwo-import-service.env
@@ -6,4 +6,6 @@ REDIS_URI=redis://redis:6379
 TRANSPORTER=nats://nats:4222
 CALIBRE_EBOOK_META_PATH=/opt/calibre/ebook-meta
 CACHER=Memory
+COMICS_DIRECTORY=/mnt/unraidshare/directconnect/downloads/comics
+USERDATA_DIRECTORY=/mnt/unraidshare/directconnect/downloads/userdata