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
parent
a2762c9f60
commit
aaf37c5d9e
|
|
@ -1,11 +1,11 @@
|
|||
FROM debian:jessie
|
||||
MAINTAINER Kelvin Chen <kelvin@kelvinchen.org>
|
||||
|
||||
# Install all dependencies that are used in multiple images
|
||||
# to avoid wasting space.
|
||||
RUN echo "deb http://httpredir.debian.org/debian jessie non-free" >> /etc/apt/sources.list && \
|
||||
apt-get update && \
|
||||
apt-get install --no-install-recommends -y \
|
||||
# Install all dependencies that are used in multiple images.
|
||||
RUN echo "deb http://httpredir.debian.org/debian jessie non-free" \
|
||||
>> /etc/apt/sources.list \
|
||||
&& apt-get update \
|
||||
&& apt-get install --no-install-recommends -y \
|
||||
vim \
|
||||
ca-certificates \
|
||||
python \
|
||||
|
|
@ -15,6 +15,6 @@ RUN echo "deb http://httpredir.debian.org/debian jessie non-free" >> /etc/apt/so
|
|||
nginx \
|
||||
unzip \
|
||||
unrar \
|
||||
supervisor && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
|
||||
supervisor \
|
||||
&& apt-get clean \
|
||||
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
|
||||
|
|
|
|||
|
|
@ -1,14 +1,10 @@
|
|||
FROM kelvinchen/seedbox:base
|
||||
MAINTAINER Kelvin Chen <kelvin@kelvinchen.org>
|
||||
|
||||
RUN apt-get update && \
|
||||
apt-get install --no-install-recommends -y apache2-utils && \
|
||||
apt-get clean && \
|
||||
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
|
||||
RUN apt-get update \
|
||||
&& apt-get install --no-install-recommends -y apache2-utils \
|
||||
&& apt-get clean \
|
||||
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
|
||||
|
||||
VOLUME /config
|
||||
|
||||
|
|
@ -18,4 +14,8 @@ ENV USERNAME=user \
|
|||
PASSWORD=hunter2 \
|
||||
USE_SSL=false
|
||||
|
||||
COPY nginx.conf common_default.conf ssl.conf /etc/nginx/
|
||||
COPY start /
|
||||
COPY ssl-gen /usr/local/bin
|
||||
|
||||
CMD ["/start"]
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ RUN apt-get update \
|
|||
easy-rsa \
|
||||
iptables \
|
||||
&& apt-get clean \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
|
||||
|
||||
WORKDIR /usr/share/easy-rsa
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +1,16 @@
|
|||
FROM kelvinchen/seedbox:base
|
||||
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 && \
|
||||
dpkg -i /tmp/plex.deb && \
|
||||
apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
|
||||
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 \
|
||||
&& apt-get clean \
|
||||
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
|
||||
|
||||
VOLUME /config
|
||||
|
||||
EXPOSE 32400
|
||||
|
||||
COPY plexmediaserver /etc/default/plexmediaserver
|
||||
COPY start Preferences.xml /
|
||||
|
||||
VOLUME /config
|
||||
EXPOSE 32400
|
||||
|
||||
CMD ["/start"]
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@ FROM kelvinchen/seedbox:base
|
|||
MAINTAINER Kelvin Chen <kelvin@kelvinchen.org>
|
||||
|
||||
# Install all dependencies
|
||||
RUN apt-get update && \
|
||||
apt-get install -y --no-install-recommends \
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y --no-install-recommends \
|
||||
rtorrent \
|
||||
php5-fpm \
|
||||
php5-cli \
|
||||
|
|
@ -18,23 +18,28 @@ RUN apt-get update && \
|
|||
libdigest-perl \
|
||||
libdigest-sha-perl \
|
||||
libhtml-parser-perl \
|
||||
libarchive-zip-perl && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
|
||||
libarchive-zip-perl \
|
||||
&& apt-get clean \
|
||||
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
|
||||
|
||||
# Configure/install r(u)torrent and autodl-irssi
|
||||
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 --recursive \
|
||||
https://github.com/autodl-community/autodl-irssi.git ~/.irssi/scripts && \
|
||||
mkdir -p ~/.irssi/scripts/autorun && \
|
||||
cp ~/.irssi/scripts/autodl-irssi.pl ~/.irssi/scripts/autorun
|
||||
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 --recursive \
|
||||
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
|
||||
|
||||
EXPOSE 80 49161 49161/udp 6881/udp
|
||||
|
||||
COPY start rtorrent.rc supervisord.conf autodl.cfg /
|
||||
COPY nginx.conf /etc/nginx/nginx.conf
|
||||
COPY rutorrent_config.php /opt/rutorrent/conf/config.php
|
||||
COPY irssi.cfg /root/.irssi/config
|
||||
EXPOSE 80 49161 49161/udp 6881/udp
|
||||
|
||||
CMD ["/start"]
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
FROM kelvinchen/seedbox:base
|
||||
MAINTAINER Kelvin Chen <kelvin@kelvinchen.org>
|
||||
|
||||
RUN apt-get update && \
|
||||
apt-get install --no-install-recommends -y \
|
||||
python-cheetah && \
|
||||
git clone --depth=1 https://github.com/SiCKRAGETV/SickRage.git /opt/sickrage && \
|
||||
apt-get clean && rm -rf /var/lib/apt/lists/*
|
||||
RUN apt-get update \
|
||||
&& apt-get install --no-install-recommends -y python-cheetah \
|
||||
&& git clone --depth=1 \
|
||||
https://github.com/SiCKRAGETV/SickRage.git \
|
||||
/opt/sickrage \
|
||||
&& apt-get clean && rm -rf /var/lib/apt/lists/*
|
||||
|
||||
VOLUME /config
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,13 @@
|
|||
FROM kelvinchen/seedbox:base
|
||||
MAINTAINER Kelvin Chen <kelvin@kelvinchen.org>
|
||||
|
||||
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 && \
|
||||
apt-get update && \
|
||||
apt-get install syncthing && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
|
||||
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 \
|
||||
&& apt-get update \
|
||||
&& apt-get install syncthing \
|
||||
&& apt-get clean \
|
||||
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
|
||||
|
||||
VOLUME /config
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
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:plex Dockerfiles/plex
|
||||
docker build -t kelvinchen/seedbox:rtorrent Dockerfiles/rtorrent
|
||||
|
|
|
|||
Loading…
Reference in New Issue