KeyArgo
/
seedbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restyle Dockerfiles 

Use leading ampersands instead of trailing ampersands as per the
examples on the docker website. e.g.
long command \
&& another command

Also change the build-all script to update the debian image when
building the base image.
This commit is contained in:
Kelvin Chen 2015-11-11 21:29:01 -05:00
parent a2762c9f60
commit aaf37c5d9e
8 changed files with 62 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Dockerfiles/base/Dockerfile
View File

@ -1,11 +1,11 @@
FROM debian:jessie FROM debian:jessie
MAINTAINER Kelvin Chen <kelvin@kelvinchen.org> MAINTAINER Kelvin Chen <kelvin@kelvinchen.org>
# Install all dependencies that are used in multiple images # Install all dependencies that are used in multiple images.
# to avoid wasting space. RUN echo "deb http://httpredir.debian.org/debian jessie non-free" \
RUN echo "deb http://httpredir.debian.org/debian jessie non-free" >> /etc/apt/sources.list && \ >> /etc/apt/sources.list \
apt-get update && \ && apt-get update \
apt-get install --no-install-recommends -y \ && apt-get install --no-install-recommends -y \
vim \ vim \
ca-certificates \ ca-certificates \
python \ python \
@ -15,6 +15,6 @@ RUN echo "deb http://httpredir.debian.org/debian jessie non-free" >> /etc/apt/so
nginx \ nginx \
unzip \ unzip \
unrar \ unrar \
supervisor && \ supervisor \
apt-get clean && \ && apt-get clean \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

16
Dockerfiles/frontend/Dockerfile
View File

@ -1,14 +1,10 @@
FROM kelvinchen/seedbox:base FROM kelvinchen/seedbox:base
MAINTAINER Kelvin Chen <kelvin@kelvinchen.org> MAINTAINER Kelvin Chen <kelvin@kelvinchen.org>
RUN apt-get update && \ RUN apt-get update \
apt-get install --no-install-recommends -y apache2-utils && \ && apt-get install --no-install-recommends -y apache2-utils \
apt-get clean && \ && apt-get clean \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
COPY nginx.conf common_default.conf ssl.conf /etc/nginx/
COPY start /
COPY ssl-gen /usr/local/bin
VOLUME /config VOLUME /config
@ -18,4 +14,8 @@ ENV USERNAME=user \
PASSWORD=hunter2 \ PASSWORD=hunter2 \
USE_SSL=false USE_SSL=false
COPY nginx.conf common_default.conf ssl.conf /etc/nginx/
COPY start /
COPY ssl-gen /usr/local/bin
CMD ["/start"] CMD ["/start"]

2
Dockerfiles/openvpn/Dockerfile
View File

@ -8,7 +8,7 @@ RUN apt-get update \
easy-rsa \ easy-rsa \
iptables \ iptables \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
WORKDIR /usr/share/easy-rsa WORKDIR /usr/share/easy-rsa

14
Dockerfiles/plex/Dockerfile
View File

@ -1,14 +1,16 @@
FROM kelvinchen/seedbox:base FROM kelvinchen/seedbox:base
MAINTAINER Kelvin Chen <kelvin@kelvinchen.org> MAINTAINER Kelvin Chen <kelvin@kelvinchen.org>
RUN curl -sL "https://plex.tv/downloads/latest/1?channel=8&build=linux-ubuntu-x86_64&distro=ubuntu&X-Plex-Token=" > /tmp/plex.deb && \ RUN curl -sL "https://plex.tv/downloads/latest/1?channel=8&build=linux-ubuntu-x86_64&distro=ubuntu&X-Plex-Token=" > /tmp/plex.deb \
dpkg -i /tmp/plex.deb && \ && dpkg -i /tmp/plex.deb \
apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
VOLUME /config
EXPOSE 32400
COPY plexmediaserver /etc/default/plexmediaserver COPY plexmediaserver /etc/default/plexmediaserver
COPY start Preferences.xml / COPY start Preferences.xml /
VOLUME /config
EXPOSE 32400
CMD ["/start"] CMD ["/start"]

29
Dockerfiles/rtorrent/Dockerfile
View File

@ -2,8 +2,8 @@ FROM kelvinchen/seedbox:base
MAINTAINER Kelvin Chen <kelvin@kelvinchen.org> MAINTAINER Kelvin Chen <kelvin@kelvinchen.org>
# Install all dependencies # Install all dependencies
RUN apt-get update && \ RUN apt-get update \
apt-get install -y --no-install-recommends \ && apt-get install -y --no-install-recommends \
rtorrent \ rtorrent \
php5-fpm \ php5-fpm \
php5-cli \ php5-cli \
@ -18,23 +18,28 @@ RUN apt-get update && \
libdigest-perl \ libdigest-perl \
libdigest-sha-perl \ libdigest-sha-perl \
libhtml-parser-perl \ libhtml-parser-perl \
libarchive-zip-perl && \ libarchive-zip-perl \
apt-get clean && \ && apt-get clean \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
# Configure/install r(u)torrent and autodl-irssi # Configure/install r(u)torrent and autodl-irssi
RUN ln -s /config/rtorrent/rtorrent.rc ~/.rtorrent.rc && \ RUN ln -s /config/rtorrent/rtorrent.rc ~/.rtorrent.rc \
git clone --depth=1 https://github.com/Novik/ruTorrent.git /opt/rutorrent && \ && git clone --depth=1 \
git clone --depth=1 --recursive \ https://github.com/Novik/ruTorrent.git \
https://github.com/autodl-community/autodl-irssi.git ~/.irssi/scripts && \ /opt/rutorrent \
mkdir -p ~/.irssi/scripts/autorun && \ && git clone --depth=1 --recursive \
cp ~/.irssi/scripts/autodl-irssi.pl ~/.irssi/scripts/autorun https://github.com/autodl-community/autodl-irssi.git \
~/.irssi/scripts \
&& mkdir -p ~/.irssi/scripts/autorun \
&& cp ~/.irssi/scripts/autodl-irssi.pl ~/.irssi/scripts/autorun
VOLUME /config /torrents VOLUME /config /torrents
EXPOSE 80 49161 49161/udp 6881/udp
COPY start rtorrent.rc supervisord.conf autodl.cfg / COPY start rtorrent.rc supervisord.conf autodl.cfg /
COPY nginx.conf /etc/nginx/nginx.conf COPY nginx.conf /etc/nginx/nginx.conf
COPY rutorrent_config.php /opt/rutorrent/conf/config.php COPY rutorrent_config.php /opt/rutorrent/conf/config.php
COPY irssi.cfg /root/.irssi/config COPY irssi.cfg /root/.irssi/config
EXPOSE 80 49161 49161/udp 6881/udp
CMD ["/start"] CMD ["/start"]

11
Dockerfiles/sickrage/Dockerfile
View File

@ -1,11 +1,12 @@
FROM kelvinchen/seedbox:base FROM kelvinchen/seedbox:base
MAINTAINER Kelvin Chen <kelvin@kelvinchen.org> MAINTAINER Kelvin Chen <kelvin@kelvinchen.org>
RUN apt-get update && \ RUN apt-get update \
apt-get install --no-install-recommends -y \ && apt-get install --no-install-recommends -y python-cheetah \
python-cheetah && \ && git clone --depth=1 \
git clone --depth=1 https://github.com/SiCKRAGETV/SickRage.git /opt/sickrage && \ https://github.com/SiCKRAGETV/SickRage.git \
apt-get clean && rm -rf /var/lib/apt/lists/* /opt/sickrage \
&& apt-get clean && rm -rf /var/lib/apt/lists/*
VOLUME /config VOLUME /config

13
Dockerfiles/syncthing/Dockerfile
View File

@ -1,12 +1,13 @@
FROM kelvinchen/seedbox:base FROM kelvinchen/seedbox:base
MAINTAINER Kelvin Chen <kelvin@kelvinchen.org> MAINTAINER Kelvin Chen <kelvin@kelvinchen.org>
RUN curl -sL https://syncthing.net/release-key.txt | apt-key add - && \ RUN curl -sL https://syncthing.net/release-key.txt | apt-key add - \
echo "deb http://apt.syncthing.net/ syncthing release" >> /etc/apt/sources.list.d/syncthing.list && \ && echo "deb http://apt.syncthing.net/ syncthing release" >> \
apt-get update && \ /etc/apt/sources.list.d/syncthing.list \
apt-get install syncthing && \ && apt-get update \
apt-get clean && \ && apt-get install syncthing \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
VOLUME /config VOLUME /config

14
build-all.sh
View File

@ -5,10 +5,10 @@
cd ${0%/*} cd ${0%/*}
docker build -t kelvinchen/seedbox:base Dockerfiles/base docker build -t kelvinchen/seedbox:base --pull Dockerfiles/base
docker build -t kelvinchen/seedbox:frontend Dockerfiles/frontend docker build -t kelvinchen/seedbox:frontend Dockerfiles/frontend
docker build -t kelvinchen/seedbox:plex Dockerfiles/plex docker build -t kelvinchen/seedbox:plex Dockerfiles/plex
docker build -t kelvinchen/seedbox:rtorrent Dockerfiles/rtorrent docker build -t kelvinchen/seedbox:rtorrent Dockerfiles/rtorrent
docker build -t kelvinchen/seedbox:sickrage Dockerfiles/sickrage docker build -t kelvinchen/seedbox:sickrage Dockerfiles/sickrage
docker build -t kelvinchen/seedbox:syncthing Dockerfiles/syncthing docker build -t kelvinchen/seedbox:syncthing Dockerfiles/syncthing
docker build -t kelvinchen/seedbox:openvpn Dockerfiles/openvpn docker build -t kelvinchen/seedbox:openvpn Dockerfiles/openvpn