Merge pull request #99 from linuxserver/blocklist

internalize blocklist-update.sh

Author: aptalca

Dockerfile

@@ -4,7 +4,7 @@ FROM lsiobase/alpine:3.11
 ARG BUILD_DATE
 ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="sparklyballs"
+LABEL maintainer="aptalca"
 
 RUN \
  echo "**** install packages ****" && \

Dockerfile.aarch64

@@ -4,7 +4,7 @@ FROM lsiobase/alpine:arm64v8-3.11
 ARG BUILD_DATE
 ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="sparklyballs"
+LABEL maintainer="aptalca"
 
 RUN \
  echo "**** install packages ****" && \

Dockerfile.armhf

@@ -4,7 +4,7 @@ FROM lsiobase/alpine:arm32v7-3.11
 ARG BUILD_DATE
 ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="sparklyballs"
+LABEL maintainer="aptalca"
 
 RUN \
  echo "**** install packages ****" && \

README.md

@@ -242,6 +242,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **30.03.20:** - Internalize blocklist-update.sh.
 * **29.03.20:** - Update auth info in readme.
 * **19.12.19:** - Rebasing to alpine 3.11.
 * **04.10.19:** - Update package label.

readme-vars.yml

@@ -73,6 +73,7 @@ app_setup_block: |
 # changelog
 changelogs:
 
+  - { date: "30.03.20:", desc: "Internalize blocklist-update.sh." }
   - { date: "29.03.20:", desc: "Update auth info in readme." }
   - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." }
   - { date: "04.10.19:", desc: "Update package label." }

root/defaults/blocklist-update.sh renamed to root/app/blocklist-update.sh

@@ -8,10 +8,6 @@ mkdir -p \
 [[ ! -f /config/settings.json ]] && cp \
 	/defaults/settings.json /config/settings.json
 
-# copy blocklist-update script
-[[ ! -f /config/blocklist-update.sh ]] && cp \
-	/defaults/blocklist-update.sh /config/blocklist-update.sh
-
 if [ ! -z "$USER" ] && [ ! -z "$PASS" ]; then
 	sed -i '/rpc-authentication-required/c\    "rpc-authentication-required": true,' /config/settings.json
 	sed -i "/rpc-username/c\    \"rpc-username\": \"$USER\"," /config/settings.json

root/etc/cont-init.d/20-config

@@ -7,4 +7,4 @@
 0       5       1       *       *       run-parts /etc/periodic/monthly
 
 # run daily blocklist update
-0 3 * * * /config/blocklist-update.sh 2>&1
+0 3 * * * /app/blocklist-update.sh 2>&1