From 009eedebfd9d40467b8a51052455fc2a7e2d0dd5 Mon Sep 17 00:00:00 2001
From: santiagosayshey <sayheysantiago@proton.me>
Date: Sat, 11 May 2024 03:25:11 +0930
Subject: [PATCH] improved dev testing suite - adjusted compose file to store
 config data - ignoring configs and data for version history - adjusted setup
 script to make second instance the dev instance

---
 .gitignore                 |  5 ++++-
 develop/docker-compose.yml | 42 --------------------------------------
 docker-compose.yml         | 30 +++++++++++++++++++++++++++
 setup.py                   |  4 ++--
 4 files changed, 36 insertions(+), 45 deletions(-)
 delete mode 100644 develop/docker-compose.yml
 create mode 100644 docker-compose.yml

diff --git a/.gitignore b/.gitignore
index 25380b1..edadf4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -161,4 +161,7 @@ cython_debug/
 
 config.yml
 
-exports/
\ No newline at end of file
+exports/
+
+config/
+data/
\ No newline at end of file
diff --git a/develop/docker-compose.yml b/develop/docker-compose.yml
deleted file mode 100644
index e8936bc..0000000
--- a/develop/docker-compose.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-version: "3.3"
-
-x-common-settings: &common-settings
-  environment:
-    PUID: 0 # user id, change as necessary
-    PGID: 0 # group id, change as necessary
-    TZ: Europe/London # timezone, change as necessary
-  restart: unless-stopped
-
-services:
-  radarr:
-    <<: *common-settings
-    image: linuxserver/radarr
-    container_name: radarr
-    ports:
-      - "7887:7878" # change the left value to the desired host port for Radarr
-    volumes:
-      - radarr_movies:/movies
-
-  radarr2:
-    <<: *common-settings
-    image: linuxserver/radarr
-    container_name: radarr2
-    ports:
-      - "7888:7878" # change the left value to the desired host port for Radarr
-
-  sonarr:
-    <<: *common-settings
-    image: linuxserver/sonarr
-    container_name: sonarr
-    ports:
-      - "8998:8989" # change the left value to the desired host port for Sonarr
-
-  sonarr2:
-    <<: *common-settings
-    image: linuxserver/sonarr
-    container_name: sonarr2
-    ports:
-      - "8999:8989" # change the left value to the desired host port for Sonarr
-
-volumes:
-  radarr_movies: # Docker managed volume for movies
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..a52ec09
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,30 @@
+version: "3.8"
+
+services:
+  radarr-dev:
+    image: lscr.io/linuxserver/radarr:latest
+    container_name: radarr-dev
+    environment:
+      - PUID=0
+      - PGID=0
+      - TZ=Etc/UTC
+    volumes:
+      - ./config/radarr-dev:/config
+      - ./data/dummy_radarr-dev:/downloads # Dummy path for downloads
+    ports:
+      - "7887:7878" # Unique port for Radarr development instance
+    restart: unless-stopped
+
+  sonarr-dev:
+    image: lscr.io/linuxserver/sonarr:latest
+    container_name: sonarr-dev
+    environment:
+      - PUID=0
+      - PGID=0
+      - TZ=Etc/UTC
+    volumes:
+      - ./config/sonarr-dev:/config
+      - ./data/dummy_sonarr-dev:/downloads # Dummy path for downloads
+    ports:
+      - "8998:8989" # Unique port for Sonarr development instance
+    restart: unless-stopped
diff --git a/setup.py b/setup.py
index a93fc73..9ddd104 100644
--- a/setup.py
+++ b/setup.py
@@ -4,14 +4,14 @@ instances:
     - name: "Master"
       base_url: "http://localhost:7878"
       api_key: "API_KEY"
-    - name: "4k-radarr"
+    - name: "DEV"
       base_url: "http://localhost:7887"
       api_key: "API_KEY"
   sonarr:
     - name: "Master"
       base_url: "http://localhost:8989"
       api_key: "API_KEY"
-    - name: "4k-sonarr"
+    - name: "DEV"
       base_url: "http://localhost:8998"
       api_key: "API_KEY"
 settings: