build: update services

ivanbeldad · Aug 1, 2018 · 4c9bcfe · 4c9bcfe
1 parent 68482d8
commit 4c9bcfe
Show file tree

Hide file tree

Showing 5 changed files with 196 additions and 80 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,16 @@
+FROM golang:1.10
+
+LABEL maintainer="Ivan de la Beldad Fernandez <[email protected]>"
+
+ENV GOPATH=/go
+
+ADD . /go/src/sonarr-parser-helper
+
+WORKDIR /go/src/sonarr-parser-helper
+
+RUN go get ./... && \
+    go build -o main .
+
+RUN ln -s /tv /televisión && ln -s /movies /películas
+
+CMD ["/go/src/sonarr-parser-helper/main"]
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,131 +2,198 @@ version: '3'
 
 services:
   plex:
+    container_name: ${COMPOSE_PROJECT_NAME}_plex
     image: plexinc/pms-docker
-    hostname: plex-${MEDIA_USERNAME}
+    hostname: plex-mediaserver
     networks:
-    - macvlan
-    - internal
+      - macvlan
+      - bridge
     environment:
-    - PLEX_UID=${MEDIA_UID}
-    - PLEX_GID=${MEDIA_GID}
+      - PLEX_UID=${MEDIA_UID}
+      - PLEX_GID=${MEDIA_GID}
     volumes:
-    - ${MEDIA_STORAGE}/${MEDIA_USERNAME}/config/plex:/config
-    - ${MEDIA_STORAGE}/${MEDIA_USERNAME}/tmp/transcode:/transcode
-    - ${MEDIA_STORAGE}/${MEDIA_USERNAME}/media:/data
-    - /etc/localtime:/etc/localtime:ro
+      - plex_conf:/config
+      - plex_logs:/config/Library/Application Support/Plex Media Server/Logs
+      - ${MEDIA_STORAGE}/tmp/transcode:/transcode
+      - ${MEDIA_STORAGE}/media:/data
+      - /etc/localtime:/etc/localtime:ro
+
+  tautulli:
+    container_name: ${COMPOSE_PROJECT_NAME}_tautulli
+    image: tautulli/tautulli
+    networks:
+      - bridge
+    environment:
+      - PUID=${MEDIA_UID}
+      - PGID=${MEDIA_GID}
+    volumes:
+      - tautulli_conf:/config
+      - plex_logs:/plex_logs:ro
+      - /etc/localtime:/etc/localtime:ro
 
   transmission:
+    container_name: ${COMPOSE_PROJECT_NAME}_transmission
     image: linuxserver/transmission
     networks:
-    - bridge
+      - bridge
     environment:
-    - PUID=${MEDIA_UID}
-    - PGID=${MEDIA_GID}
+      - PUID=${MEDIA_UID}
+      - PGID=${MEDIA_GID}
     volumes:
-    - ${MEDIA_STORAGE}/${MEDIA_USERNAME}/config/transmission:/config
-    - ${MEDIA_STORAGE}/${MEDIA_USERNAME}/tmp/downloads:/downloads
-    - ${MEDIA_STORAGE}/${MEDIA_USERNAME}/tmp/watch:/watch
-    - /etc/localtime:/etc/localtime:ro
+      - transmission_conf:/config
+      - ${MEDIA_STORAGE}/tmp/downloads:/downloads
+      - ${MEDIA_STORAGE}/tmp/watch:/watch
+      - /etc/localtime:/etc/localtime:ro
 
   sonarr:
+    container_name: ${COMPOSE_PROJECT_NAME}_sonarr
     image: linuxserver/sonarr
     depends_on:
-    - transmission
-    - jackett
+      - transmission
+      - jackett
     networks:
-    - bridge
-    - internal
+      - bridge
     environment:
-    - PUID=${MEDIA_UID}
-    - PGID=${MEDIA_GID}
+      - PUID=${MEDIA_UID}
+      - PGID=${MEDIA_GID}
     volumes:
-    - ${MEDIA_STORAGE}/${MEDIA_USERNAME}/config/sonarr:/config
-    - ${MEDIA_STORAGE}/${MEDIA_USERNAME}/tmp/downloads:/downloads
-    - ${MEDIA_STORAGE}/${MEDIA_USERNAME}/media/tv:/tv
-    - /etc/localtime:/etc/localtime:ro
+    #- ${MEDIA_STORAGE}/config/sonarr:/config
+      - sonarr_conf:/config
+      - ${MEDIA_STORAGE}/tmp/downloads:/downloads
+      - ${MEDIA_STORAGE}/media/tv:/tv
+      - /etc/localtime:/etc/localtime:ro
+
+  sonarr_es:
+    container_name: ${COMPOSE_PROJECT_NAME}_sonarr_es
+    build:
+      context: sonarr_es
+    depends_on:
+      - transmission
+      - jackett
+    networks:
+      - bridge
+    environment:
+      - PUID=${MEDIA_UID}
+      - PGID=${MEDIA_GID}
+    volumes:
+      - sonarr_es_conf:/config
+      - ${MEDIA_STORAGE}/tmp/downloads:/downloads
+      - ${MEDIA_STORAGE}/media/es/tv:/tv
+      - /etc/localtime:/etc/localtime:ro
+
+  parserr:
+    container_name: ${COMPOSE_PROJECT_NAME}_parserr
+    build:
+      context: parserr
+    depends_on:
+      - sonarr_es
+      - radarr_es
+    networks:
+      - bridge
+    user: ${MEDIA_UID}:${MEDIA_GID}
+    environment:
+      - SONARR_DOWNLOAD_FOLDER=${SONARR_DOWNLOAD_FOLDER}
+      - SONARR_URL=${SONARR_URL}
+      - SONARR_APIKEY=${SONARR_APIKEY}
+      - RADARR_DOWNLOAD_FOLDER=${RADARR_DOWNLOAD_FOLDER}
+      - RADARR_URL=${RADARR_URL}
+      - RADARR_APIKEY=${RADARR_APIKEY}
+    volumes:
+      - ${MEDIA_STORAGE}/tmp/downloads:${SONARR_DOWNLOAD_FOLDER}
 
   radarr:
+    container_name: ${COMPOSE_PROJECT_NAME}_radarr
     image: linuxserver/radarr
     depends_on:
-    - transmission
-    - jackett
+      - transmission
+      - jackett
     networks:
-    - bridge
-    - internal
+      - bridge
     environment:
-    - PUID=${MEDIA_UID}
-    - PGID=${MEDIA_GID}
+      - PUID=${MEDIA_UID}
+      - PGID=${MEDIA_GID}
     volumes:
-    - ${MEDIA_STORAGE}/${MEDIA_USERNAME}/config/radarr:/config
-    - ${MEDIA_STORAGE}/${MEDIA_USERNAME}/tmp/downloads:/downloads
-    - ${MEDIA_STORAGE}/${MEDIA_USERNAME}/media/movies:/movies
-    - /etc/localtime:/etc/localtime:ro
+      - radarr_conf:/config
+      - ${MEDIA_STORAGE}/tmp/downloads:/downloads
+      - ${MEDIA_STORAGE}/media/movies:/movies
+      - /etc/localtime:/etc/localtime:ro
 
-  jackett:
-    image: linuxserver/jackett
+  radarr_es:
+    container_name: ${COMPOSE_PROJECT_NAME}_radarr_es
+    build:
+      context: radarr_es
+    depends_on:
+      - transmission
+      - jackett
     networks:
-    - bridge
+      - bridge
     environment:
-    - PUID=${MEDIA_UID}
-    - PGID=${MEDIA_GID}
+      - PUID=${MEDIA_UID}
+      - PGID=${MEDIA_GID}
     volumes:
-    - ${MEDIA_STORAGE}/${MEDIA_USERNAME}/config/jackett:/config
-    - ${MEDIA_STORAGE}/${MEDIA_USERNAME}/tmp/watch:/downloads
-    - /etc/localtime:/etc/localtime:ro
+      - radarr_es_conf:/config
+      - ${MEDIA_STORAGE}/tmp/downloads:/downloads
+      - ${MEDIA_STORAGE}/media/es/movies:/movies
+      - /etc/localtime:/etc/localtime:ro
 
-  tautulli:
-    image: tautulli/tautulli
+  jackett:
+    container_name: ${COMPOSE_PROJECT_NAME}_jackett
+    image: linuxserver/jackett
     networks:
-    - bridge
+      - bridge
     environment:
-    - PUID=${MEDIA_UID}
-    - PGID=${MEDIA_GID}
+      - PUID=${MEDIA_UID}
+      - PGID=${MEDIA_GID}
     volumes:
-    - ${MEDIA_STORAGE}/${MEDIA_USERNAME}/config/tautulli:/config
-    - ${MEDIA_STORAGE}/${MEDIA_USERNAME}/config/plex/Application\ Support/Plex\ Media\ Server/Logs:/logs:ro
-    - /etc/localtime:/etc/localtime:ro
+      - jackett_conf:/config
+      - ${MEDIA_STORAGE}/tmp/watch:/downloads
+      - /etc/localtime:/etc/localtime:ro
 
   nginx:
+    container_name: ${COMPOSE_PROJECT_NAME}_nginx
     build:
       context: nginx
     ports:
-    - ${MEDIA_BASE_PORT}00:32400
-    - ${MEDIA_BASE_PORT}01:9091
-    - ${MEDIA_BASE_PORT}02:8989
-    - ${MEDIA_BASE_PORT}03:7878
-    - ${MEDIA_BASE_PORT}04:9117
-    - ${MEDIA_BASE_PORT}05:8181
+      - ${MEDIA_BASE_PORT}00:32400
+      - ${MEDIA_BASE_PORT}01:9091
+      - ${MEDIA_BASE_PORT}02:8989
+      - ${MEDIA_BASE_PORT}03:7878
+      - ${MEDIA_BASE_PORT}04:9117
+      - ${MEDIA_BASE_PORT}05:8181
+      - ${MEDIA_BASE_PORT}06:9898
+      - ${MEDIA_BASE_PORT}07:8787
     depends_on:
-    - transmission
-    - jackett
-    - sonarr
-    - radarr
-    - plex
+      - transmission
+      - jackett
+      - sonarr
+      - sonarr_es
+      - radarr
+      - radarr_es
+      - plex
     networks:
-    - bridge
-    - internal
+      - bridge
     environment:
-    - PUID=${MEDIA_UID}
-    - PGID=${MEDIA_GID}
+      - PUID=${MEDIA_UID}
+      - PGID=${MEDIA_GID}
     volumes:
-    - /etc/localtime:/etc/localtime:ro
-    - ${MEDIA_STORAGE}/${MEDIA_USERNAME}/config/nginx:/etc/nginx/conf.d
+      - nginx_conf:/etc/nginx/conf.d
+      - /etc/localtime:/etc/localtime:ro
 
-  ddclient:
-    image: linuxserver/ddclient
-    environment:
-    - PUID=${MEDIA_UID}
-    - PGID=${MEDIA_GID}
-    volumes:
-    - ${MEDIA_STORAGE}/${MEDIA_USERNAME}/config/ddclient:/config
-    - /etc/localtime:/etc/localtime:ro
+volumes:
+  plex_conf:
+  plex_logs:
+  transmission_conf:
+  jackett_conf:
+  sonarr_conf:
+  sonarr_es_conf:
+  radarr_conf:
+  radarr_es_conf:
+  tautulli_conf:
+  nginx_conf:
 
 networks:
   bridge:
     driver: bridge
   macvlan:
     external: true
-  internal:
-    driver: overlay
-    internal: true
+
diff --git a/nginx/docker/default.conf b/nginx/docker/default.conf
@@ -28,6 +28,20 @@ server {
     }
 }
 
+
+server {
+    listen 9898;
+    location / {
+        proxy_pass "http://sonarr-spanish:8989";
+        proxy_set_header        X-Real-IP  $remote_addr;
+        proxy_set_header        Host            $host;
+        proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header        X-Forwarded-Proto $scheme;
+        proxy_redirect off;
+        proxy_buffering off;
+    }
+}
+
 server {
     listen 7878;
     location / {
@@ -41,6 +55,19 @@ server {
     }
 }
 
+server {
+    listen 8787;
+    location / {
+        proxy_pass "http://radarr-spanish:7878";
+        proxy_set_header        X-Real-IP  $remote_addr;
+        proxy_set_header        Host            $host;
+        proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header        X-Forwarded-Proto $scheme;
+        proxy_redirect off;
+        proxy_buffering off;
+    }
+}
+
 server {
     listen 8181;
     location / {

diff --git a/radarr_es/Dockerfile b/radarr_es/Dockerfile
@@ -0,0 +1,3 @@
+FROM linuxserver/radarr:latest
+
+RUN ln -s /movies /películas
diff --git a/sonarr_es/Dockerfile b/sonarr_es/Dockerfile
@@ -0,0 +1,3 @@
+FROM linuxserver/sonarr:latest
+
+RUN ln -s /tv /televisión
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		FROM linuxserver/radarr:latest

		RUN ln -s /movies /películas
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		FROM linuxserver/sonarr:latest

		RUN ln -s /tv /televisión