Remove CP, use latest Jackett release, use Mono 5.x, cleanup

This commit is contained in:
Jean Froment 2017-08-22 16:59:33 +02:00
parent 27682ab1e3
commit a926014c28
7 changed files with 9 additions and 72 deletions

View File

@ -1,17 +0,0 @@
FROM lsiobase/alpine.python:3.6
MAINTAINER fromenje
# set python to use utf-8 rather than ascii.
ENV PYTHONIOENCODING="UTF-8"
# install app
RUN \
git clone --depth 1 https://github.com/CouchPotato/CouchPotatoServer /app/couchpotato
# add local files
COPY root/ /
# ports and volumes
EXPOSE 5050
WORKDIR /app/couchpotato
VOLUME /config /downloads /movies

View File

@ -1,12 +0,0 @@
#!/usr/bin/with-contenv bash
# create folders
mkdir -p \
/var/log/couchpotato
# permissions
chown -R abc:abc \
/app
chmod 777 \
/var/log/couchpotato

View File

@ -1,8 +0,0 @@
#!/usr/bin/with-contenv bash
UMASK_SET=${UMASK_SET:-022}
umask "$UMASK_SET"
exec \
s6-setuidgid abc python /app/couchpotato/CouchPotato.py \
--config_file=/config/CouchPotato/config.ini --data_dir=/config/CouchPotato/data

View File

@ -1,19 +1,18 @@
FROM buildpack-deps:xenial-scm FROM buildpack-deps:xenial-scm
MAINTAINER Jean Froment <froment.je@gmail.com> MAINTAINER Jean Froment <froment.je@gmail.com>
# Get latest path for Jackett
RUN jack_tag=$(curl -sX GET "https://api.github.com/repos/Jackett/Jackett/releases/latest" \
| awk '/tag_name/{print $4;exit}' FS='[""]') \
# Install Sonarr, S6, and Jackett # Install Sonarr, S6, and Jackett
&& echo "deb http://apt.sonarr.tv/ master main" \ RUN echo "deb http://apt.sonarr.tv/ master main" \
> /etc/apt/sources.list.d/sonarr.list \ > /etc/apt/sources.list.d/sonarr.list \
&& echo "deb http://download.mono-project.com/repo/ubuntu xenial main" \
> /etc/apt/sources.list.d/mono.list \
&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys FDA5DFFC \ && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys FDA5DFFC \
&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF \
&& apt-get update \ && apt-get update \
&& apt-get install -y nzbdrone libcurl4-openssl-dev mono-devel \ && apt-get install -y mono-complete nzbdrone libcurl4-openssl-dev \
&& curl -sL "https://github.com/just-containers/s6-overlay/releases/download/v1.18.1.5/s6-overlay-amd64.tar.gz" \ && curl -sL "https://github.com/just-containers/s6-overlay/releases/download/v1.18.1.5/s6-overlay-amd64.tar.gz" \
| tar xz -C / \ | tar xz -C / \
&& curl -sL "https://github.com/Jackett/Jackett/releases/download/$jack_tag/Jackett.Binaries.Mono.tar.gz" \ && curl -sL $(curl -sL https://api.github.com/repos/Jackett/Jackett/releases | grep browser_download_url | grep Mono | head -n 1 | cut -d '"' -f 4) \
| tar xz -C /opt \ | tar xz -C /opt \
&& apt-get clean && rm -rf /var/lib/apt/lists/* && apt-get clean && rm -rf /var/lib/apt/lists/*

View File

@ -27,6 +27,6 @@ docker build -t fromenje/seedbox:plex $ARGS Dockerfiles/plex &
docker build -t fromenje/seedbox:deluge $ARGS Dockerfiles/deluge & docker build -t fromenje/seedbox:deluge $ARGS Dockerfiles/deluge &
docker build -t fromenje/seedbox:sonarr $ARGS Dockerfiles/sonarr & docker build -t fromenje/seedbox:sonarr $ARGS Dockerfiles/sonarr &
docker build -t fromenje/seedbox:h5ai $ARGS Dockerfiles/h5ai & docker build -t fromenje/seedbox:h5ai $ARGS Dockerfiles/h5ai &
docker build -t fromenje/seedbox:couchpotato $ARGS Dockerfiles/couchpotato & docker build -t fromenje/seedbox:radarr $ARGS Dockerfiles/radarr &
wait wait

View File

@ -12,14 +12,6 @@ volumes:
driver: local-persist driver: local-persist
driver_opts: driver_opts:
mountpoint: /data/torrents mountpoint: /data/torrents
downloads:
driver: local-persist
driver_opts:
mountpoint: /data/torrents/deluge
movies:
driver: local-persist
driver_opts:
mountpoint: /data/torrents/Movies
services: services:
frontend: frontend:
@ -86,23 +78,6 @@ services:
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
couchpotato:
image: fromenje/seedbox:couchpotato
build: Dockerfiles/couchpotato
restart: always
networks:
- main
volumes:
- config:/config
- downloads:/downloads
- movies:/movies
env_file:
- config
environment:
- PGID=0
- PUID=0
- TZ=Europe/Paris
radarr: radarr:
image: fromenje/seedbox:radarr image: fromenje/seedbox:radarr
build: Dockerfiles/radarr build: Dockerfiles/radarr

View File

@ -7,4 +7,4 @@ docker push fromenje/seedbox:plex
docker push fromenje/seedbox:sonarr docker push fromenje/seedbox:sonarr
docker push fromenje/seedbox:deluge docker push fromenje/seedbox:deluge
docker push fromenje/seedbox:h5ai docker push fromenje/seedbox:h5ai
docker push fromenje/seedbox:couchpotato docker push fromenje/seedbox:radarr