From 68dc22e6148956a80dd7b1395baba2ee3eea06e0 Mon Sep 17 00:00:00 2001
From: Adam Dodman <adam.dodman@gmx.com>
Date: Mon, 7 Aug 2017 13:21:00 +0100
Subject: [PATCH] Fix Dockerfile, Clean Repo a little

---
 docker-compose.noproxy.yml | 79 --------------------------------------
 docker-compose.yml         |  4 +-
 2 files changed, 2 insertions(+), 81 deletions(-)
 delete mode 100644 docker-compose.noproxy.yml

diff --git a/docker-compose.noproxy.yml b/docker-compose.noproxy.yml
deleted file mode 100644
index edc30ca..0000000
--- a/docker-compose.noproxy.yml
+++ /dev/null
@@ -1,79 +0,0 @@
-version: '2'
-
-services:
-    data:
-        image: tianon/true
-        volumes:
-            - $VOLDIR:/config
-
-    nzbget:
-        image: adamant/nzbget
-        depends_on:
-            - data
-        volumes_from:
-            - data
-            - container:media
-        restart: always
-        ports:
-            - "6789:6789"
-
-    deluge:
-        image: adamant/deluge
-        depends_on:
-            - data
-        volumes_from:
-            - data
-            - container:media
-        restart: always
-        ports:
-            - "8112:8112"
-            - "58846:58846"
-            - "53160:53160"
-            - "53160:53160/udp"
-
-    sickrage:
-        image: adamant/sickrage
-        depends_on:
-             - deluge
-             - nzbget
-        volumes_from:
-            - data
-            - container:media
-        restart: always
-        ports:
-            - "8081:8081"
-
-    couchpotato:
-        image: adamant/couchpotato
-        depends_on:
-             - deluge
-             - nzbget
-        volumes_from:
-            - data
-            - container:media
-        restart: always
-        ports:
-            - "5050:5050"
-
-    plex:
-        image: adamant/alpine-plex
-        depends_on:
-            - sickrage
-            - couchpotato
-        volumes_from:
-            - data
-            - container:media
-        restart: always
-        network_mode: "host"
-        ports:
-            - "32400:32400"
-
-    plexpy:
-        image: adamant/plexpy
-        depends_on:
-            - plex
-        volumes_from:
-            - data
-        restart: always
-        ports:
-            - "8182:8181"
diff --git a/docker-compose.yml b/docker-compose.yml
index 92b2e36..cf82439 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -46,10 +46,10 @@ services:
         restart: always
 
     plex:
-        image: adamant/plex-tiny
+        image: adamant/plexmediaserver:plexpass
         depends_on:
             - sickrage
-            - couchpotato
+            - radarr
         volumes:
             - $VOLDIR/plex:/config/Plex Media Server
         volumes_from: