diff --git a/Dockerfiles/frontend/init b/Dockerfiles/frontend/init index 123cd10..2bbcdec 100755 --- a/Dockerfiles/frontend/init +++ b/Dockerfiles/frontend/init @@ -20,4 +20,4 @@ if $USE_SSL ; then fi fi -nginx -g "daemon off;" +exec nginx -g "daemon off;" diff --git a/Dockerfiles/frontend/nginx.conf b/Dockerfiles/frontend/nginx.conf index b9c5a94..05443bb 100644 --- a/Dockerfiles/frontend/nginx.conf +++ b/Dockerfiles/frontend/nginx.conf @@ -86,6 +86,16 @@ http { proxy_pass $sonarr; } } + + server { + include common.conf; + server_name ~^(jackett)(\.\w+)+$; + + location / { + set $sonarr http://sonarr:9117; + proxy_pass $sonarr; + } + } } # vim: ft=nginx diff --git a/Dockerfiles/sonarr/Dockerfile b/Dockerfiles/sonarr/Dockerfile index 9c1daae..fd5707c 100644 --- a/Dockerfiles/sonarr/Dockerfile +++ b/Dockerfiles/sonarr/Dockerfile @@ -1,18 +1,26 @@ FROM buildpack-deps:xenial-scm MAINTAINER Kelvin Chen -# Install Sonarr +# Install Sonarr, S6, and Jackett RUN echo "deb http://apt.sonarr.tv/ master main" \ > /etc/apt/sources.list.d/sonarr.list \ && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys FDA5DFFC \ && apt-get update \ - && apt-get install -y nzbdrone \ + && apt-get install -y nzbdrone libcurl4-openssl-dev \ + && curl -sL "https://github.com/just-containers/s6-overlay/releases/download/v1.18.1.5/s6-overlay-amd64.tar.gz" \ + | tar xz -C / \ + && curl -sL "https://github.com/Jackett/Jackett/releases/download/v0.7.420/Jackett.Binaries.Mono.tar.gz" \ + | tar xz -C /opt \ && apt-get clean && rm -rf /var/lib/apt/lists/* +# Set Jackett config path +ENV XDG_DATA_HOME="/config" \ + XDG_CONFIG_HOME="/config" + VOLUME /config -EXPOSE 8989 +EXPOSE 8989 9117 -COPY init / +COPY services.d /etc/services.d CMD ["/init"] diff --git a/Dockerfiles/sonarr/services.d/jackett/run b/Dockerfiles/sonarr/services.d/jackett/run new file mode 100644 index 0000000..abb725f --- /dev/null +++ b/Dockerfiles/sonarr/services.d/jackett/run @@ -0,0 +1,3 @@ +#!/usr/bin/with-contenv sh + +exec mono /opt/Jackett/JackettConsole.exe diff --git a/Dockerfiles/sonarr/services.d/sonarr/run b/Dockerfiles/sonarr/services.d/sonarr/run new file mode 100644 index 0000000..6934275 --- /dev/null +++ b/Dockerfiles/sonarr/services.d/sonarr/run @@ -0,0 +1,7 @@ +#!/usr/bin/with-contenv sh + +mkdir -p /config/sonarr + +rm -f /config/sonarr/nzbdrone.pid + +exec mono /opt/NzbDrone/NzbDrone.exe -nobrowser -data=/config/sonarr diff --git a/README.md b/README.md index 8633a03..cd3c552 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,7 @@ Included services are: - rtorrent - sickrage - sonarr +- jackett (included in the sonarr image) - syncthing - plex