Dockery/docker-transmission
1
0
Fork 0
mirror of https://github.com/linuxserver/docker-transmission.git synced 2025-11-02 01:35:47 +01:00
Code Issues Packages Projects Releases Activity

Merge pull request #99 from linuxserver/blocklist

Browse Source 
internalize blocklist-update.sh
This commit is contained in:
aptalca
2020-03-30 15:06:45 -04:00
committed by GitHub
parent 9603a105da 132410bcca
commit c2730e283f
8 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

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

2
Dockerfile.aarch64
View File

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

2
Dockerfile.armhf
View File

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

1
README.md
View File

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

1
readme-vars.yml
View File

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

0
root/defaults/blocklist-update.sh → root/app/blocklist-update.sh Normal file → Executable file
View File

4
root/etc/cont-init.d/20-config
View File

@@ -8,10 +8,6 @@ mkdir -p \
[[ ! -f /config/settings.json ]] && cp \ [[ ! -f /config/settings.json ]] && cp \
/defaults/settings.json /config/settings.json /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 if [ ! -z "$USER" ] && [ ! -z "$PASS" ]; then
sed -i '/rpc-authentication-required/c\ "rpc-authentication-required": true,' /config/settings.json sed -i '/rpc-authentication-required/c\ "rpc-authentication-required": true,' /config/settings.json
sed -i "/rpc-username/c\ \"rpc-username\": \"$USER\"," /config/settings.json sed -i "/rpc-username/c\ \"rpc-username\": \"$USER\"," /config/settings.json

2
root/etc/crontabs/root
View File

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