rtorrent-flood: remove root process

This commit is contained in:
Wonderfall 2016-09-17 14:08:45 +02:00
parent 4564ce5c06
commit bace90ccc4
5 changed files with 19 additions and 29 deletions

View File

@ -6,8 +6,7 @@ ARG LIBTORRENT_VER=0.13.6
ARG FILEBOT_VER=4.7.2 ARG FILEBOT_VER=4.7.2
ARG BUILD_CORES ARG BUILD_CORES
ENV UID=991 \ ENV UID=991 GID=991 \
GID=991 \
FLOOD_SECRET=supersecret \ FLOOD_SECRET=supersecret \
PKG_CONFIG_PATH=/usr/local/lib/pkgconfig PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
@ -34,8 +33,9 @@ RUN echo "@community https://nl.alpinelinux.org/alpine/v3.4/community" >> /etc/a
gzip \ gzip \
zip \ zip \
unrar \ unrar \
supervisor \ s6 \
tini@community \ su-exec \
python \
openjdk8-jre@community \ openjdk8-jre@community \
&& cd /tmp && mkdir libtorrent rtorrent \ && cd /tmp && mkdir libtorrent rtorrent \
&& cd libtorrent && wget -qO- https://github.com/rakshasa/libtorrent/archive/${LIBTORRENT_VER}.tar.gz | tar xz --strip 1 \ && cd libtorrent && wget -qO- https://github.com/rakshasa/libtorrent/archive/${LIBTORRENT_VER}.tar.gz | tar xz --strip 1 \
@ -58,14 +58,14 @@ RUN echo "@community https://nl.alpinelinux.org/alpine/v3.4/community" >> /etc/a
&& rm -rf /var/cache/apk/* /tmp/* && rm -rf /var/cache/apk/* /tmp/*
COPY config.js /usr/flood/ COPY config.js /usr/flood/
COPY supervisord.ini /etc/supervisor.d/ COPY s6.d /etc/s6.d
COPY startup /usr/bin/ COPY run.sh /usr/bin/
COPY postdl /usr/bin/ COPY postdl /usr/bin/
COPY postrm /usr/bin/ COPY postrm /usr/bin/
COPY config.js /usr/flood/ COPY config.js /usr/flood/
COPY rtorrent.rc /home/torrent/.rtorrent.rc COPY rtorrent.rc /home/torrent/.rtorrent.rc
RUN chmod +x /usr/bin/* \ RUN chmod +x /usr/bin/* /etc/s6.d/*/* \
&& cd /usr/flood && ./node_modules/.bin/gulp dist && cd /usr/flood && ./node_modules/.bin/gulp dist
VOLUME /data /usr/flood/server/db VOLUME /data /usr/flood/server/db
@ -77,4 +77,4 @@ LABEL description="BitTorrent client with WebUI front-end" \
libtorrent="libtorrent v$LIBTORRENT_VER" \ libtorrent="libtorrent v$LIBTORRENT_VER" \
filebot="Filebot v$FILEBOT_VER" filebot="Filebot v$FILEBOT_VER"
CMD ["/sbin/tini","--","startup"] CMD ["run.sh"]

View File

@ -1,5 +1,4 @@
#!/bin/sh #!/bin/sh
addgroup -g ${GID} torrent && adduser -h /home/torrent -s /bin/sh -G torrent -D -u ${UID} torrent
mkdir -p /data/torrents mkdir -p /data/torrents
mkdir -p /data/.watch mkdir -p /data/.watch
@ -11,6 +10,6 @@ mkdir -p /data/Media/Music
sed -i -e "s/<FLOOD_SECRET>/$FLOOD_SECRET/g" /usr/flood/config.js sed -i -e "s/<FLOOD_SECRET>/$FLOOD_SECRET/g" /usr/flood/config.js
rm -f /data/.session/rtorrent.lock rm -f /data/.session/rtorrent.lock
chown -R torrent:torrent /data /home/torrent /filebot /usr/flood chown -R $UID:$GID /data /home/torrent /tmp /filebot /usr/flood /etc/s6.d
exec /usr/bin/supervisord -c /etc/supervisord.conf exec su-exec $GID:$UID /bin/s6-svscan /etc/s6.d

View File

@ -0,0 +1,3 @@
#!/bin/sh
cd /usr/flood
exec /usr/flood/server/bin/www

View File

@ -0,0 +1,6 @@
#!/bin/sh
export TERM="xterm"
export HOME="/home/torrent"
export PWD="/home/torrent"
cd /home/torrent
exec rtorrent

View File

@ -1,18 +0,0 @@
[supervisord]
nodaemon=true
[program:rtorrent]
user=torrent
directory=/home/torrent
priority=2
redirect_stderr=true
environment=HOME="/home/torrent",PWD="/home/torrent",LOGNAME="rtorrent",USER="torrent",TERM="xterm"
command=rtorrent
autorestart=true
[program:flood]
user=torrent
directory=/usr/flood
redirect_stderr=true
command=/usr/flood/server/bin/www
autorestart=true