diff --git a/Dockerfile b/Dockerfile index fef2313..cf87b3a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,10 +18,12 @@ RUN \ python3 \ rsync \ tar \ + unrar \ + unzip \ transmission-cli \ transmission-daemon \ - unrar \ - unzip && \ + nodejs \ + npm && \ echo "**** install transmission ****" && \ if [ -z ${TRANSMISSION_VERSION+x} ]; then \ TRANSMISSION_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ @@ -32,11 +34,11 @@ RUN \ transmission-daemon==${TRANSMISSION_VERSION} && \ echo "**** install third party themes ****" && \ curl -o \ - /tmp/combustion.zip -L \ - "https://github.com/Secretmapper/combustion/archive/release.zip" && \ - unzip \ - /tmp/combustion.zip -d \ - / && \ + /tmp/combustion.tar.gz -L \ + "https://github.com/Secretmapper/combustion/archive/release.tar.gz" && \ + tar xf \ + /tmp/combustion.tar.gz -C \ + / --strip-components=1 && \ mkdir -p /tmp/twctemp && \ TWCVERSION=$(curl -sX GET "https://api.github.com/repos/ronggang/transmission-web-control/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]') && \ @@ -54,9 +56,23 @@ RUN \ tar xf \ /tmp/kettu.tar.gz -C \ /kettu --strip-components=1 && \ + mkdir -p /flood-for-transmission && \ + mkdir -p /tmp/flood-for-transmission && \ + curl -o \ + /tmp/flood-for-transmission.tar.gz -L \ + "https://github.com/johman10/flood-for-transmission/archive/master.tar.gz" && \ + tar xf \ + /tmp/flood-for-transmission.tar.gz -C \ + /tmp/flood-for-transmission --strip-components=1 && \ + cd /tmp/flood-for-transmission && \ + npm ci && \ + npm run build && \ + cd / && \ + mv /tmp/flood-for-transmission/public/** /flood-for-transmission && \ echo "**** cleanup ****" && \ rm -rf \ - /tmp/* + /tmp/* && \ + apk del nodejs npm # copy local files diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 40146fc..db43999 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -18,10 +18,12 @@ RUN \ python3 \ rsync \ tar \ + unrar \ + unzip \ transmission-cli \ transmission-daemon \ - unrar \ - unzip && \ + nodejs \ + npm && \ echo "**** install transmission ****" && \ if [ -z ${TRANSMISSION_VERSION+x} ]; then \ TRANSMISSION_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ @@ -32,11 +34,11 @@ RUN \ transmission-daemon==${TRANSMISSION_VERSION} && \ echo "**** install third party themes ****" && \ curl -o \ - /tmp/combustion.zip -L \ - "https://github.com/Secretmapper/combustion/archive/release.zip" && \ - unzip \ - /tmp/combustion.zip -d \ - / && \ + /tmp/combustion.tar.gz -L \ + "https://github.com/Secretmapper/combustion/archive/release.tar.gz" && \ + tar xf \ + /tmp/combustion.tar.gz -C \ + / --strip-components=1 && \ mkdir -p /tmp/twctemp && \ TWCVERSION=$(curl -sX GET "https://api.github.com/repos/ronggang/transmission-web-control/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]') && \ @@ -54,10 +56,23 @@ RUN \ tar xf \ /tmp/kettu.tar.gz -C \ /kettu --strip-components=1 && \ + mkdir -p /flood-for-transmission && \ + mkdir -p /tmp/flood-for-transmission && \ + curl -o \ + /tmp/flood-for-transmission.tar.gz -L \ + "https://github.com/johman10/flood-for-transmission/archive/master.tar.gz" && \ + tar xf \ + /tmp/flood-for-transmission.tar.gz -C \ + /tmp/flood-for-transmission --strip-components=1 && \ + cd /tmp/flood-for-transmission && \ + npm ci && \ + npm run build && \ + cd / && \ + mv /tmp/flood-for-transmission/public/** /flood-for-transmission && \ echo "**** cleanup ****" && \ rm -rf \ /tmp/* - + apk del nodejs npm # copy local files COPY root/ / @@ -65,4 +80,3 @@ COPY root/ / # ports and volumes EXPOSE 9091 51413 VOLUME /config /downloads /watch - diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 2460d94..4e38bda 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -18,10 +18,12 @@ RUN \ python3 \ rsync \ tar \ + unrar \ + unzip \ transmission-cli \ transmission-daemon \ - unrar \ - unzip && \ + nodejs \ + npm && \ echo "**** install transmission ****" && \ if [ -z ${TRANSMISSION_VERSION+x} ]; then \ TRANSMISSION_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ @@ -32,11 +34,11 @@ RUN \ transmission-daemon==${TRANSMISSION_VERSION} && \ echo "**** install third party themes ****" && \ curl -o \ - /tmp/combustion.zip -L \ - "https://github.com/Secretmapper/combustion/archive/release.zip" && \ - unzip \ - /tmp/combustion.zip -d \ - / && \ + /tmp/combustion.tar.gz -L \ + "https://github.com/Secretmapper/combustion/archive/release.tar.gz" && \ + tar xf \ + /tmp/combustion.tar.gz -C \ + / --strip-components=1 && \ mkdir -p /tmp/twctemp && \ TWCVERSION=$(curl -sX GET "https://api.github.com/repos/ronggang/transmission-web-control/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]') && \ @@ -54,6 +56,19 @@ RUN \ tar xf \ /tmp/kettu.tar.gz -C \ /kettu --strip-components=1 && \ + mkdir -p /flood-for-transmission && \ + mkdir -p /tmp/flood-for-transmission && \ + curl -o \ + /tmp/flood-for-transmission.tar.gz -L \ + "https://github.com/johman10/flood-for-transmission/archive/master.tar.gz" && \ + tar xf \ + /tmp/flood-for-transmission.tar.gz -C \ + /tmp/flood-for-transmission --strip-components=1 && \ + cd /tmp/flood-for-transmission && \ + npm ci && \ + npm run build && \ + cd / && \ + mv /tmp/flood-for-transmission/public/** /flood-for-transmission && \ echo "**** cleanup ****" && \ rm -rf \ /tmp/* @@ -65,4 +80,3 @@ COPY root/ / # ports and volumes EXPOSE 9091 51413 VOLUME /config /downloads /watch - diff --git a/README.md b/README.md index e1112a5..e29c8a0 100644 --- a/README.md +++ b/README.md @@ -126,7 +126,7 @@ Container images are configured using parameters passed at runtime (such as thos | `-e PUID=1000` | for UserID - see below for explanation | | `-e PGID=1000` | for GroupID - see below for explanation | | `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London. | -| `-e TRANSMISSION_WEB_HOME=/combustion-release/` | Specify an alternative UI options are `/combustion-release/`, `/transmission-web-control/`, and `/kettu/` . | +| `-e TRANSMISSION_WEB_HOME=/combustion-release/` | Specify an alternative UI options are [`/combustion-release/`](https://github.com/Secretmapper/combustion), [`/transmission-web-control/`](https://github.com/ronggang/transmission-web-control), [`/kettu/`](https://github.com/endor/kettu) and [`/flood-for-transmission/`](https://github.com/johman10/flood-for-transmission). | | `-e USER=username` | Specify an optional username for the interface | | `-e PASS=password` | Specify an optional password for the interface | | `-e WHITELIST=iplist` | Specify an optional list of comma separated host whitelist | @@ -260,6 +260,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **06.03.21:** - Add Flood for Transmission as a UI option * **23.01.21:** - Rebasing to alpine 3.13. * **02.11.20:** - Add ca-certificates package to allow connecting to https trackers. * **02.06.20:** - Rebase to alpine 3.12, update to transmission 3.0, remove python2, add python3.