diff --git a/Dockerfile b/Dockerfile index 2aecf5a..b6e1a5e 100644 --- a/Dockerfile +++ b/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 ****" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 4a4dee6..9cec149 100644 --- a/Dockerfile.aarch64 +++ b/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 ****" && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 7c705d3..bdba7cc 100644 --- a/Dockerfile.armhf +++ b/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 ****" && \ diff --git a/README.md b/README.md index c7cee1c..8c9ef9a 100644 --- a/README.md +++ b/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. diff --git a/readme-vars.yml b/readme-vars.yml index 66c1d70..3875aa5 100644 --- a/readme-vars.yml +++ b/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." } diff --git a/root/defaults/blocklist-update.sh b/root/app/blocklist-update.sh old mode 100644 new mode 100755 similarity index 100% rename from root/defaults/blocklist-update.sh rename to root/app/blocklist-update.sh diff --git a/root/etc/cont-init.d/20-config b/root/etc/cont-init.d/20-config index b8efad2..9f8d1a3 100644 --- a/root/etc/cont-init.d/20-config +++ b/root/etc/cont-init.d/20-config @@ -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 diff --git a/root/etc/crontabs/root b/root/etc/crontabs/root index 0c91e82..481bc04 100644 --- a/root/etc/crontabs/root +++ b/root/etc/crontabs/root @@ -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