Merge pull request #38 from linuxserver/rsync

Add rsync package

Dockerfile

@@ -1,4 +1,4 @@
-FROM lsiobase/alpine
+FROM lsiobase/alpine:3.6
 MAINTAINER sparklyballs
 
 # set version label
@@ -11,8 +11,14 @@ RUN \
  apk add --no-cache \
 	curl \
 	jq \
+	openssl \
+	p7zip \
+	rsync \
+	tar \
 	transmission-cli \
-	transmission-daemon
+	transmission-daemon \
+	unrar \
+	unzip
 
 # copy local files
 COPY root/ /

README.md

@@ -2,6 +2,8 @@
 [forumurl]: https://forum.linuxserver.io
 [ircurl]: https://www.linuxserver.io/irc/
 [podcasturl]: https://www.linuxserver.io/podcast/
+[appurl]: https://www.transmissionbt.com/
+[hub]: https://hub.docker.com/r/linuxserver/transmission/
 
 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
 
@@ -11,13 +13,11 @@ The [LinuxServer.io][linuxserverurl] team brings you another container release f
 * [Podcast][podcasturl] covers everything to do with getting the most from your Linux Server plus a focus on all things Docker and containerisation!
 
 # linuxserver/transmission
-[![](https://images.microbadger.com/badges/version/linuxserver/transmission.svg)](https://microbadger.com/images/linuxserver/transmission "Get your own version badge on microbadger.com")[![](https://images.microbadger.com/badges/image/linuxserver/transmission.svg)](http://microbadger.com/images/linuxserver/transmission "Get your own image badge on microbadger.com")[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/transmission.svg)][hub][![Docker Stars](https://img.shields.io/docker/stars/linuxserver/transmission.svg)][hub][![Build Status](http://jenkins.linuxserver.io:8080/buildStatus/icon?job=Dockers/LinuxServer.io/linuxserver-transmission)](http://jenkins.linuxserver.io:8080/job/Dockers/job/LinuxServer.io/job/linuxserver-transmission/)
+[![](https://images.microbadger.com/badges/version/linuxserver/transmission.svg)](https://microbadger.com/images/linuxserver/transmission "Get your own version badge on microbadger.com")[![](https://images.microbadger.com/badges/image/linuxserver/transmission.svg)](https://microbadger.com/images/linuxserver/transmission "Get your own image badge on microbadger.com")[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/transmission.svg)][hub][![Docker Stars](https://img.shields.io/docker/stars/linuxserver/transmission.svg)][hub][![Build Status](https://ci.linuxserver.io/buildStatus/icon?job=Docker-Builders/x86-64/x86-64-transmission)](https://ci.linuxserver.io/job/Docker-Builders/job/x86-64/job/x86-64-transmission/)
-[hub]: https://hub.docker.com/r/linuxserver/transmission/
 
 Transmission is designed for easy, powerful use. Transmission has the features you want from a BitTorrent client: encryption, a web interface, peer exchange, magnet links, DHT, µTP, UPnP and NAT-PMP port forwarding, webseed support, watch directories, tracker editing, global and per-torrent speed limits, and more. [Transmission](http://www.transmissionbt.com/about/)
 
-[![transmission](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/transmission.png)][transurl]
+[![transmission](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/transmission.png)][appurl]
-[transurl]: https://www.transmissionbt.com/
 
 ## Usage
 
@@ -67,7 +67,7 @@ In this instance `PUID=1001` and `PGID=1001`. To find yours use `id user` as bel
 
 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.
 
-## Securing the webui with a username/password.
+## Securing the webui with a username/password.
 
 this requires 3 settings to be changed in the settings.json file.
 
@@ -104,6 +104,10 @@ The automatic update will run once a day at 3am local server time.
 
 ## Versions
 
++ **25.07.17:** Add rsync package.
++ **27.05.17:** Rebase to alpine linux 3.6.
++ **06.02.17:** Rebase to alpine linux 3.5.
++ **15.01.17:** Add p7zip, tar , unrar and unzip packages.
 + **16.10.16:** Blocklist autoupdate with optional authentication.
 + **14.10.16:** Add version layer information.
 + **23.09.16:** Add information about securing the webui to README..

root/defaults/blocklist-update.sh

@@ -1,10 +1,20 @@
 #!/usr/bin/with-contenv bash
 
-BLOCKLIST_URL=`jq -r '.["blocklist-url"]' settings.json`
+BLOCKLIST_ENABLED=`jq -r '.["blocklist-enabled"]' /config/settings.json`
+BLOCKLIST_URL=`jq -r '.["blocklist-url"]' /config/settings.json | sed 's/\&/\&/g'`
 
-rm /config/blocklists/*
+if [ $BLOCKLIST_ENABLED == true ]; then
-cd /config/blocklists
+	mkdir -p /tmp/blocklists
-wget -q $BLOCKLIST_URL
+	rm -rf /tmp/blocklists/*
-gunzip *.gz
+	cd /tmp/blocklists
-chmod go+r *
+	wget -q -O blocklist.gz "$BLOCKLIST_URL"
-s6-svc -h /var/run/s6/services/transmission
+	if [ $? == 0 ]; then
+		gunzip *.gz
+		if [ $? == 0 ]; then
+			chmod go+r *
+			rm -rf /config/blocklists/*
+			cp /tmp/blocklists/* /config/blocklists
+			s6-svc -h /var/run/s6/services/transmission
+		fi
+	fi
+fi