From 7942c49bd4c6adfab126f3aafe96ba5a3d00ec94 Mon Sep 17 00:00:00 2001
From: David Ludwig <davidludwigii@gmail.com>
Date: Mon, 26 Apr 2021 21:50:03 -0500
Subject: [PATCH] Post-processing has been added

---
 .gitignore             |  3 +++
 docker-compose.dev.yml | 18 ++++++++++++---
 docker-compose.yml     | 50 ++++++++++++++++++++----------------------
 request                |  2 +-
 seeker                 |  2 +-
 torrent-client         |  2 +-
 torrent-client-v2      |  2 +-
 torrent-webui          |  2 +-
 8 files changed, 47 insertions(+), 34 deletions(-)

diff --git a/.gitignore b/.gitignore
index 24f99ff..6d44fa3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,6 @@
 
 # Environment varibales
 .env
+
+# Environment docker-compose configuration
+docker-compose.env.yml
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 895ae65..1b469d8 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -13,7 +13,7 @@ services:
 
   seeker:
     build:
-      target: base
+      target: base-dev
     volumes:
       - ./seeker:/app
     entrypoint: "/bin/sh"
@@ -31,12 +31,24 @@ services:
 
   torrent_client:
     build:
-      target: base-dev
+      target: base
     volumes:
-      - ./torrent-client-v2:/app
+      - ./torrent-client:/app
     # ulimits:
       # core:
       #   hard: -1
       #   soft: -1
     entrypoint: "/bin/sh"
     tty: true
+
+  # torrent_client:
+  #   build:
+  #     target: base-dev
+  #   volumes:
+  #     - ./torrent-client-v2:/app
+  #   # ulimits:
+  #     # core:
+  #     #   hard: -1
+  #     #   soft: -1
+  #   entrypoint: "/bin/sh"
+  #   tty: true
diff --git a/docker-compose.yml b/docker-compose.yml
index c445087..65b7c84 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -63,14 +63,35 @@ services:
     volumes:
       - var:/var/autoplex
 
+  torrent_client:
+    build:
+      context: ./torrent-client
+    depends_on:
+      - "database"
+      - "vpn"
+    env_file:
+      - ./torrent-client/.env
+    healthcheck:
+      test: ["CMD", "ping", "-q", "-c1", "google.com"]
+      interval: 5m
+      timeout: 10s
+      retries: 3
+      start_period: 5m
+    network_mode: service:vpn
+    restart: unless-stopped
+    secrets:
+      - mysql_root_password
+    user: ${UID}:${GID}
+    volumes:
+      - var:/var/autoplex
+
   # torrent_client:
   #   build:
-  #     context: ./torrent-client
+  #     context: ./torrent-client-v2
   #   depends_on:
-  #     - "database"
   #     - "vpn"
   #   env_file:
-  #     - ./torrent-client/.env
+  #     - ./torrent-client-v2/.env
   #   healthcheck:
   #     test: ["CMD", "ping", "-q", "-c1", "google.com"]
   #     interval: 5m
@@ -79,33 +100,11 @@ services:
   #     start_period: 5m
   #   network_mode: service:vpn
   #   restart: unless-stopped
-  #   secrets:
-  #     - mysql_root_password
   #   user: ${UID}:${GID}
   #   volumes:
   #     - ./.volumes/storage:/storage/default
   #     - var:/var/autoplex
 
-  torrent_client:
-    build:
-      context: ./torrent-client-v2
-    depends_on:
-      - "vpn"
-    env_file:
-      - ./torrent-client-v2/.env
-    healthcheck:
-      test: ["CMD", "ping", "-q", "-c1", "google.com"]
-      interval: 5m
-      timeout: 10s
-      retries: 3
-      start_period: 5m
-    network_mode: service:vpn
-    restart: unless-stopped
-    user: ${UID}:${GID}
-    volumes:
-      - ./.volumes/storage:/storage/default
-      - var:/var/autoplex
-
   database:
     image: mysql
     command: --default-authentication-plugin=mysql_native_password
@@ -146,7 +145,6 @@ services:
       - label:disable
     stdin_open: true
     tty: true
-    # user: ${UID}:${GID}
     volumes:
       - /dev/net:/dev/net:z
       - ./.volumes/vpn:/vpn
diff --git a/request b/request
index 3c96e85..8784717 160000
--- a/request
+++ b/request
@@ -1 +1 @@
-Subproject commit 3c96e8573f4ebca1703028db06f29cbf349196e6
+Subproject commit 878471730238d8461bdc9e738170239a668c433f
diff --git a/seeker b/seeker
index 0e7a761..ec5f599 160000
--- a/seeker
+++ b/seeker
@@ -1 +1 @@
-Subproject commit 0e7a7618d487477a5de99f21d0ab488f8394b955
+Subproject commit ec5f59948e186fe88409856117c1320f831fbc22
diff --git a/torrent-client b/torrent-client
index 31dedba..c66f4f9 160000
--- a/torrent-client
+++ b/torrent-client
@@ -1 +1 @@
-Subproject commit 31dedbad8bdf865dacb524ab628abb030ee1a703
+Subproject commit c66f4f9e921fbd738d4a0875f5fdf38a889c8bb0
diff --git a/torrent-client-v2 b/torrent-client-v2
index bffe124..11df663 160000
--- a/torrent-client-v2
+++ b/torrent-client-v2
@@ -1 +1 @@
-Subproject commit bffe12462bcc5c9ee0f2c7dfb15bc74ee96ac968
+Subproject commit 11df663d336453c9b12be2a9a8f16bdc0952e700
diff --git a/torrent-webui b/torrent-webui
index 944f184..24e80ea 160000
--- a/torrent-webui
+++ b/torrent-webui
@@ -1 +1 @@
-Subproject commit 944f184a6bb235ffc2acf7200e9742d4fbe86163
+Subproject commit 24e80eaf3f9f374058be4d43e05b612e269fe040