From c6e755eca648cb43f70c1d648178d956125cc030 Mon Sep 17 00:00:00 2001
From: Rishi Ghan <rishi.ghan@gmail.com>
Date: Tue, 2 Nov 2021 00:08:31 -0700
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=B3=20Volume=20mapping=20in=20docker-c?=
 =?UTF-8?q?ompose=20first=20draft?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.env            |  0
 docker-compose.yml            | 17 ++++++++++++++---
 docker-env/docker-compose.env |  3 +++
 proxy.conf                    | 30 ------------------------------
 4 files changed, 17 insertions(+), 33 deletions(-)
 delete mode 100644 docker-compose.env
 create mode 100644 docker-env/docker-compose.env
 delete mode 100644 proxy.conf

diff --git a/docker-compose.env b/docker-compose.env
deleted file mode 100644
index e69de29..0000000
diff --git a/docker-compose.yml b/docker-compose.yml
index be907ce..0ba45e2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,10 +6,11 @@ services:
       context: .
     image: frishi/threetwo
     container_name: threetwo-ui
-    env_file: ./docker-compose.env
-    environment:
-      UNDERLYING_HOSTNAME: rook
+    env_file: ./docker-env/docker-compose.env
     restart: unless-stopped
+    volumes:
+      - "comics:/comics"
+      - "userdata:/userdata"
     ports:
       - "8050:8050"
       - "3050:3050"
@@ -33,6 +34,9 @@ services:
     container_name: comicvine-api
     ports:
       - "3080:3080"
+    volumes:
+      - "comics:/comics"
+      - "userdata:/userdata"
     environment:
       SERVICES: api
     env_file: ./docker-env/comicvine-service.env
@@ -64,6 +68,9 @@ services:
     ports:
       - "3000:3000"
       - "3001:3001"
+    volumes:
+      - "comics:/comics"
+      - "userdata:/userdata"
     environment:
       SERVICES: api
     env_file: ./docker-env/threetwo-import-service.env
@@ -184,6 +191,10 @@ networks:
     external: true
 
 volumes:
+  comics:
+    name: ${COMICS_DIRECTORY}
+  userdata:
+    name: ${USERDATA_DIRECTORY}
   mongodb_data:
     driver: local
 
diff --git a/docker-env/docker-compose.env b/docker-env/docker-compose.env
new file mode 100644
index 0000000..d41ff13
--- /dev/null
+++ b/docker-env/docker-compose.env
@@ -0,0 +1,3 @@
+UNDERLYING_HOSTNAME=rook
+COMICS_DIRECTORY=/mnt/data/comics
+USERDATA_DIRECTORY=/mnt/data/userdata
\ No newline at end of file
diff --git a/proxy.conf b/proxy.conf
deleted file mode 100644
index e0fb836..0000000
--- a/proxy.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-server {
-    listen  0.0.0.0:8050;
-    location / {
-        proxy_pass   http://0.0.0.0:8050;
-    }
-}
-
-server {
-    listen 0.0.0.0:8051;
-   
-    location /comicvine-service {
-        proxy_pass  http://0.0.0.0:8051;
-    }
-}
-
-server {
-    listen 0.0.0.0:3080;
-   
-    location /comicvine-service {
-        proxy_pass  http://0.0.0.0:3080;
-    }
-}
-
-server {
-    listen 0.0.0.0:3000;
-   
-    location /import-service {
-        proxy_pass  http://0.0.0.0:3000;
-    }
-}
\ No newline at end of file