diff --git a/Dockerfile b/Dockerfile index ff7207a..347d372 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,6 +26,7 @@ ARG DELUGE_CONFIG=${DELUGE_HOME} ARG DELUGE_CONFIG_TEMPLATE=${DELUGE_HOME}-template + #----------------------------------------------------------------------------------------------------------------------- ARG DELUGED='#!/bin/bash \n\ \n\ @@ -73,7 +74,7 @@ environment=HOME='${DELUGE_HOME} RUN urpmi.update -a \ - && urpmi --force deluge myip --no-recommends \ + && urpmi --force deluge --no-recommends \ && useradd --home-dir ${DELUGE_HOME} --password "" deluge \ && mkdir ${DELUGE_SPOOL} \ && echo -e "${DELUGED}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/deluged \ diff --git a/ReadMe.txt b/ReadMe.txt index adb63b3..7d61f78 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -5,10 +5,11 @@ Welcome to Rx3-Docker/Deluge docker image! This project aims to build a Deluge docker image. Features: - - Curtently based on deluge 2.1.1 & rx3-docker/server:1.2.2-mga9 image, + - Curtently based on deluge 2.1.1 & rx3-docker/server:1.2.3-mga9 image, - Enabled Deluge plugin: AutoAdd, Label, Stats & WebUi, - Optional additional storage directories support, - - Default Login/Password: deluge/delugeadmin + - Default Login/Password: deluge/delugeadmin, + - Support DNS forwarding to avoid DNS leaking. diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index ce22c40..41c119a 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,13 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/Deluge V 1.1.2 - A. GIBERT - 2025/05/28 +------------------------------------------------------------------------------------------------------------------------------------ + +- Use now rx3-docker/server:1.2.3-mga9 image, +- Enable DNS forwarding to prevent DNS leak! +- Remove myip installation already installed on server image. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/Deluge V 1.1.1 - A. GIBERT - 2025/05/26 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/compose.yaml b/compose.yaml index 349c70f..70e68fd 100644 --- a/compose.yaml +++ b/compose.yaml @@ -30,6 +30,11 @@ services: restart: unless-stopped environment: + SERVER_CROND_ENABLED: ${SERVER_CROND_ENABLED} + SERVER_DNS_ENABLED: ${SERVER_DNS_ENABLED} + SERVER_DNS_DEFAULT: ${SERVER_DNS_DEFAULT} + SERVER_DNS_MAP: ${SERVER_DNS_MAP} + SERVER_DNS_SEARCH: ${SERVER_DNS_SEARCH} DELUGE_UID: ${P2P_USER_ID} DELUGE_GID: ${P2P_GROUP_ID} DELUGE_PORT_BT_LOW: ${P2P_PORT_BT_LOW} diff --git a/env.dist b/env.dist index 77299d2..c9b7d76 100644 --- a/env.dist +++ b/env.dist @@ -21,7 +21,7 @@ APPL_NAME="deluge" APPL_NAME_FULL="Deluge" APPL_NAME_SHORT="deluge" APPL_ORG="rx3" -APPL_VERSION="1.1.1" +APPL_VERSION="1.1.2" APPL_MAINTAINER='"Arnaud G. GIBERT" ' APPL_URL_PREFIX="${ORG_REGISTRY}/${APPL_ORG}" @@ -76,7 +76,7 @@ DOCKER_TOOLS_VOLUME=SINGLE # | Prefix | Name | URL Prefix | Name | Name Full | Version | URL Prefix | Name | Version | Name | Version | Ext | Int | Ext | Int | Name / Id | Name / Id | #------------------+----------+--------------------------+--------------------+------------------+-------------------------------+----------------------+--------------------+---------------+------------+--------------+------------+--------------+-------+---------------+-------+--------------+--------------+ -docker_service_add P2P peer2peer ${ORG_URL_PREFIX} deluge "Rx3-Docker/Deluge" ${APPL_VERSION}-mga9 ${ORG_URL_PREFIX} server 1.2.2-mga9 - - ${PORT_MAIN} 58846 ${PORT_ADMIN} 8112 ${APPL_USER} ${APPL_GROUP} +docker_service_add P2P peer2peer ${ORG_URL_PREFIX} deluge "Rx3-Docker/Deluge" ${APPL_VERSION}-mga9 ${ORG_URL_PREFIX} server 1.2.3-mga9 - - ${PORT_MAIN} 58846 ${PORT_ADMIN} 8112 ${APPL_USER} ${APPL_GROUP} @@ -86,6 +86,11 @@ docker_service_add P2P peer2peer ${ORG_URL_PREFIX} SERVER_CROND_ENABLED="FALSE" +SERVER_DNS_ENABLED="TRUE" +SERVER_DNS_DEFAULT="1.1.1.1" +SERVER_DNS_MAP="rx3:10.0.0.1 10.in-addr.arpa:10.0.0.1 168.192.in-addr.arpa:10.0.0.1" +SERVER_DNS_SEARCH="xor.rx3 and.rx3 not.rx3 mob.rx3 fix.rx3 rx3 rx3.net" + P2P_SPOOL_INT="/var/spool/${P2P_IMG_NAME}" P2P_SPOOL_EXT=".${P2P_SPOOL_INT}"