From 707af67a86b0c1d04c00df7ad6b090bb5d68969c Mon Sep 17 00:00:00 2001 From: Wonderfall Date: Tue, 17 Jan 2017 23:55:28 +0100 Subject: [PATCH] rtorrent-flood: add mediainfo, alpine 3.5 --- rtorrent-flood/Dockerfile | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/rtorrent-flood/Dockerfile b/rtorrent-flood/Dockerfile index cdd9c56..0269916 100644 --- a/rtorrent-flood/Dockerfile +++ b/rtorrent-flood/Dockerfile @@ -1,8 +1,9 @@ -FROM mhart/alpine-node-auto:6 +FROM alpine:3.5 MAINTAINER Wonderfall ARG RTORRENT_VER=0.9.6 ARG LIBTORRENT_VER=0.13.6 +ARG MEDIAINFO_VER=0.7.91 ARG FILEBOT_VER=4.7.7 ARG BUILD_CORES @@ -10,7 +11,7 @@ ENV UID=991 GID=991 \ FLOOD_SECRET=supersecret \ PKG_CONFIG_PATH=/usr/local/lib/pkgconfig -RUN echo "@community https://nl.alpinelinux.org/alpine/v3.4/community" >> /etc/apk/repositories \ +RUN echo "@community https://nl.alpinelinux.org/alpine/v3.5/community" >> /etc/apk/repositories \ && NB_CORES=${BUILD_CORES-`getconf _NPROCESSORS_CONF`} \ && BUILD_DEPS=" \ build-base \ @@ -23,7 +24,7 @@ RUN echo "@community https://nl.alpinelinux.org/alpine/v3.4/community" >> /etc/a xz \ subversion \ cppunit-dev \ - openssl-dev \ + libressl-dev \ ncurses-dev \ curl-dev \ binutils" \ @@ -37,6 +38,7 @@ RUN echo "@community https://nl.alpinelinux.org/alpine/v3.4/community" >> /etc/a s6 \ su-exec \ python \ + nodejs \ openjdk8-jre@community \ && cd /tmp && mkdir libtorrent rtorrent \ && cd libtorrent && wget -qO- https://github.com/rakshasa/libtorrent/archive/${LIBTORRENT_VER}.tar.gz | tar xz --strip 1 \ @@ -48,13 +50,24 @@ RUN echo "@community https://nl.alpinelinux.org/alpine/v3.4/community" >> /etc/a && cd /tmp/xmlrpc-c/stable && ./configure && make -j ${NB_CORES} && make install \ && cd /tmp/libtorrent && ./autogen.sh && ./configure && make -j ${NB_CORES} && make install \ && cd /tmp/rtorrent && ./autogen.sh && ./configure --with-xmlrpc-c && make -j ${NB_CORES} && make install \ + && cd /tmp \ + && wget -q http://mediaarea.net/download/binary/mediainfo/${MEDIAINFO_VER}/MediaInfo_CLI_${MEDIAINFO_VER}_GNU_FromSource.tar.gz \ + && wget -q http://mediaarea.net/download/binary/libmediainfo0/${MEDIAINFO_VER}/MediaInfo_DLL_${MEDIAINFO_VER}_GNU_FromSource.tar.gz \ + && tar xzf MediaInfo_DLL_${MEDIAINFO_VER}_GNU_FromSource.tar.gz \ + && tar xzf MediaInfo_CLI_${MEDIAINFO_VER}_GNU_FromSource.tar.gz \ + && cd /tmp/MediaInfo_DLL_GNU_FromSource && ./SO_Compile.sh \ + && cd /tmp/MediaInfo_DLL_GNU_FromSource/ZenLib/Project/GNU/Library && make install \ + && cd /tmp/MediaInfo_DLL_GNU_FromSource/MediaInfoLib/Project/GNU/Library && make install \ + && cd /tmp/MediaInfo_CLI_GNU_FromSource && ./CLI_Compile.sh \ + && cd /tmp/MediaInfo_CLI_GNU_FromSource/MediaInfo/Project/GNU/CLI && make install \ && strip -s /usr/local/bin/rtorrent \ && strip -s /usr/local/bin/mktorrent \ + && strip -s /usr/local/bin/mediainfo \ && mkdir /filebot && cd /filebot \ && wget -q http://sourceforge.mirrorservice.org/f/fi/filebot/filebot/FileBot_${FILEBOT_VER}/FileBot_${FILEBOT_VER}-portable.tar.xz \ && tar xJf FileBot_${FILEBOT_VER}-portable.tar.xz && rm FileBot_${FILEBOT_VER}-portable.tar.xz \ && cd /usr && git clone https://github.com/jfurrow/flood && cd flood \ - && npm install \ + && npm install --production \ && apk del ${BUILD_DEPS} \ && rm -rf /var/cache/apk/* /tmp/* @@ -66,8 +79,7 @@ COPY postrm /usr/bin/ COPY config.js /usr/flood/ COPY rtorrent.rc /home/torrent/.rtorrent.rc -RUN chmod +x /usr/bin/* /etc/s6.d/*/* /etc/s6.d/.s6-svscan/* \ - && cd /usr/flood && ./node_modules/.bin/gulp dist +RUN chmod +x /usr/bin/* /etc/s6.d/*/* /etc/s6.d/.s6-svscan/* VOLUME /data /usr/flood/server/db