Merge pull request #25 from linuxserver/3.5

rebase to alpine 3.5
2025-12-24 08:59:43 +01:00 · 2017-02-06 17:29:05 +00:00 · 2017-02-06 17:00:43 +00:00 · 2017-01-16 13:00:59 +00:00 · 2017-01-15 22:31:19 +00:00 · 2017-01-15 22:12:38 +00:00
3 changed files with 26 additions and 10 deletions
--- a/8
+++ b/8
@@ -1,4 +1,4 @@
-FROM lsiobase/alpine
+FROM lsiobase/alpine:3.5
 MAINTAINER sparklyballs

 # set version label
@@ -11,8 +11,12 @@ RUN \
 apk add --no-cache \
 	curl \
 	jq \
+	p7zip \
+	tar \
 	transmission-cli \
-	transmission-daemon
+	transmission-daemon \
+	unrar \
+	unzip

 # copy local files
 COPY root/ /
--- a/README.md
+++ b/README.md
@@ -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,8 @@ The automatic update will run once a day at 3am local server time.

 ## Versions

+ **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..
--- a/root/defaults/blocklist-update.sh
+++ b/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/\&amp;/\&/g'`

-rm /config/blocklists/*
-cd /config/blocklists
-wget -q $BLOCKLIST_URL
-gunzip *.gz
-chmod go+r *
-s6-svc -h /var/run/s6/services/transmission
+if [ $BLOCKLIST_ENABLED == true ]; then
+	mkdir -p /tmp/blocklists
+	rm -rf /tmp/blocklists/*
+	cd /tmp/blocklists
+	wget -q -O blocklist.gz "$BLOCKLIST_URL"
+	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
Author	SHA1	Message	Date
Neil	d22fdb48dc	Merge pull request #25 from linuxserver/3.5 rebase to alpine 3.5	2017-02-06 17:29:05 +00:00
sparklyballs	97dfe76a57	rebase to alpine 3.5	2017-02-06 17:00:43 +00:00
sparklyballs	76293d786a	fix spacing one of headers	2017-01-16 13:00:59 +00:00
Neil	1f0f18517d	Merge pull request #23 from linuxserver/unpackers add p7zip, tar , unrar and unzip packages	2017-01-15 22:31:19 +00:00
sparklyballs	f505697081	add p7zip, tar , unrar and unzip packages	2017-01-15 22:12:38 +00:00
sparklyballs	d9420323ac	add p7zip, tar , unrar and unzip packages	2017-01-15 22:08:31 +00:00
sparklyballs	5138709d55	Merge pull request #18 from phendryx/blocklist-cleanup Blocklist script cleanup	2016-11-10 05:01:51 +00:00
Paul Hendryx	f7490f4fd7	full path to settings.json	2016-11-03 07:12:13 -04:00
Paul Hendryx	6bad2d716e	replace & with &, static filename output for wget	2016-11-02 10:04:54 -04:00
Paul Hendryx	72c8df500e	working script from container	2016-11-02 09:39:55 -04:00
Paul Hendryx	a1b5353ea2	fixed update script	2016-11-02 09:38:19 -04:00