diff --git a/Dockerfile b/Dockerfile index 3d6249b..a1d8cc1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,26 +1,14 @@ -FROM linuxserver/baseimage +FROM lsiobase/alpine +MAINTAINER sparklyballs -MAINTAINER Sparklyballs +# install packages +RUN \ + apk add --no-cache \ + transmission-daemon -ENV APTLIST="transmission-daemon" +# add local files +COPY root/ / -# add repository -RUN add-apt-repository ppa:transmissionbt/ppa && \ - -# install packages -apt-get update -q && \ -apt-get install $APTLIST -qy && \ - -# cleanup -apt-get clean && rm -rf /tmp/* /var/lib/apt/lists/* /var/tmp/* - -#Adding Custom files -ADD init/ /etc/my_init.d/ -ADD services/ /etc/service/ -#ADD cron/ /etc/cron.d/ -ADD defaults/ /defaults/ -RUN chmod -v +x /etc/service/*/run && chmod -v +x /etc/my_init.d/*.sh - # Volumes and Ports -VOLUME /config /downloads /watch +VOLUME /config /downloads /watch EXPOSE 9091 51413 diff --git a/README.md b/README.md index 331a3cb..7971681 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![https://linuxserver.io](http://www.linuxserver.io/wp-content/uploads/2015/06/linuxserver_medium.png) -The [LinuxServer.io](https://www.linuxserver.io/) team brings you another quality container release featuring auto-update on startup, easy user mapping and community support. Be sure to checkout our [forums](https://forum.linuxserver.io/index.php) or for real-time support our [IRC](https://www.linuxserver.io/index.php/irc/) on freenode at `#linuxserver.io`. +The [LinuxServer.io](https://www.linuxserver.io/) team brings you another quality container release featuring easy user mapping and community support. Be sure to checkout our [forums](https://forum.linuxserver.io/index.php) or for real-time support our [IRC](https://www.linuxserver.io/index.php/irc/) on freenode at `#linuxserver.io`. # linuxserver/transmission @@ -30,7 +30,7 @@ linuxserver/transmission * `-e PGID` for GroupID - see below for explanation * `-e PUID` for UserID - see below for explanation -It is based on phusion-baseimage with ssh removed, for shell access whilst the container is running do `docker exec -it transmission /bin/bash`. +It is based on alpine linux with s6 overlay, for shell access whilst the container is running do `docker exec -it transmission /bin/bash`. ### User / Group Identifiers @@ -43,14 +43,14 @@ Part of what makes our containers work so well is by allowing you to specify you Webui is on port 9091, the settings.json file in /config has extra settings not available in the webui. Stop the container before editing it or any changes won't be saved. -## Updates +## Info -* Upgrade to the latest version simply `docker restart transmission`. * To monitor the logs of the container in realtime `docker logs -f transmission`. ## Versions -+ **06.12.2015:** Separate mapping for watch folder. -+ **16.11.2015:** Initial Release. ++ **01.07.16:** Rebase to alpine for smaller image size. ++ **06.12.15:** Separate mapping for watch folder. ++ **16.11.15:** Initial Release. diff --git a/defaults/settings.json b/root/defaults/settings.json similarity index 100% rename from defaults/settings.json rename to root/defaults/settings.json diff --git a/init/30_set_config.sh b/root/etc/cont-init.d/20-config similarity index 88% rename from init/30_set_config.sh rename to root/etc/cont-init.d/20-config index 016040b..cf9ae65 100644 --- a/init/30_set_config.sh +++ b/root/etc/cont-init.d/20-config @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/with-contenv bash mkdir -p /downloads/{complete,incomplete} /watch diff --git a/root/etc/services.d/transmission/run b/root/etc/services.d/transmission/run new file mode 100644 index 0000000..398812f --- /dev/null +++ b/root/etc/services.d/transmission/run @@ -0,0 +1,3 @@ +#!/usr/bin/with-contenv bash + +s6-setuidgid abc /usr/bin/transmission-daemon -g /config -c /watch -f diff --git a/services/transmission/run b/services/transmission/run deleted file mode 100644 index 945f3fd..0000000 --- a/services/transmission/run +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -/sbin/setuser abc /usr/bin/transmission-daemon -g /config -c /watch -f