Compare commits

..

No commits in common. "master" and "deluge-1.1.1" have entirely different histories.

5 changed files with 12 additions and 79 deletions

View File

@ -26,7 +26,6 @@ ARG DELUGE_CONFIG=${DELUGE_HOME}
ARG DELUGE_CONFIG_TEMPLATE=${DELUGE_HOME}-template ARG DELUGE_CONFIG_TEMPLATE=${DELUGE_HOME}-template
#----------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------
ARG DELUGED='#!/bin/bash \n\ ARG DELUGED='#!/bin/bash \n\
\n\ \n\
@ -73,9 +72,9 @@ environment=HOME='${DELUGE_HOME}
RUN useradd --home-dir ${DELUGE_HOME} --password "" deluge \ RUN urpmi.update -a \
&& urpmi.update -a \ && urpmi --force deluge myip --no-recommends \
&& urpmi --force deluge --no-recommends \ && useradd --home-dir ${DELUGE_HOME} --password "" deluge \
&& mkdir ${DELUGE_SPOOL} \ && mkdir ${DELUGE_SPOOL} \
&& echo -e "${DELUGED}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/deluged \ && echo -e "${DELUGED}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/deluged \
&& chmod a+x /etc/init.d/deluged \ && chmod a+x /etc/init.d/deluged \

View File

@ -5,11 +5,10 @@ Welcome to Rx3-Docker/Deluge docker image!
This project aims to build a Deluge docker image. This project aims to build a Deluge docker image.
Features: Features:
- Curtently based on deluge 2.2.0 & rx3-docker/server:1.2.7-mga9 image, - Curtently based on deluge 2.1.1 & rx3-docker/server:1.2.2-mga9 image,
- Enabled Deluge plugin: AutoAdd, Label, Stats & WebUi, - Enabled Deluge plugin: AutoAdd, Label, Stats & WebUi,
- Optional additional storage directories support, - Optional additional storage directories support,
- Default Login/Password: deluge/delugeadmin, - Default Login/Password: deluge/delugeadmin
- Support DNS forwarding to avoid DNS leaking.

View File

@ -1,57 +1,3 @@
------------------------------------------------------------------------------------------------------------------------------------
Rx3-Docker/Deluge V 1.2.4 - A. GIBERT - 2025/11/29
------------------------------------------------------------------------------------------------------------------------------------
- Use now rx3-docker/server:1.2.7-mga9 image,
- Rebuild for updates.
------------------------------------------------------------------------------------------------------------------------------------
Rx3-Docker/Deluge V 1.2.3 - A. GIBERT - 2025/09/19
------------------------------------------------------------------------------------------------------------------------------------
- Use now rx3-docker/server:1.2.6-mga9 image,
- Rebuild for updates.
------------------------------------------------------------------------------------------------------------------------------------
Rx3-Docker/Deluge V 1.2.2 - A. GIBERT - 2025/07/03
------------------------------------------------------------------------------------------------------------------------------------
- Fix Docker masquerading,
- Disable by default docker_tools network setup.
------------------------------------------------------------------------------------------------------------------------------------
Rx3-Docker/Deluge V 1.2.1 - A. GIBERT - 2025/06/26
------------------------------------------------------------------------------------------------------------------------------------
- Use now rx3-docker/server:1.2.4-mga9 image,
- DNS re-run config bug on a already created container fixed by new server image.
------------------------------------------------------------------------------------------------------------------------------------
Rx3-Docker/Deluge V 1.2.0 - A. GIBERT - 2025/06/12
------------------------------------------------------------------------------------------------------------------------------------
- Update to deluge 2.2.0
------------------------------------------------------------------------------------------------------------------------------------
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 Rx3-Docker/Deluge V 1.1.1 - A. GIBERT - 2025/05/26
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------

View File

@ -30,11 +30,6 @@ services:
restart: unless-stopped restart: unless-stopped
environment: 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_UID: ${P2P_USER_ID}
DELUGE_GID: ${P2P_GROUP_ID} DELUGE_GID: ${P2P_GROUP_ID}
DELUGE_PORT_BT_LOW: ${P2P_PORT_BT_LOW} DELUGE_PORT_BT_LOW: ${P2P_PORT_BT_LOW}
@ -75,7 +70,6 @@ networks:
driver: bridge driver: bridge
driver_opts: driver_opts:
com.docker.network.bridge.name: ${NETWORK_IF_NAME} com.docker.network.bridge.name: ${NETWORK_IF_NAME}
com.docker.network.bridge.enable_ip_masquerade: "false"
ipam: ipam:
config: config:
- subnet: ${NETWORK_SUBNET} - subnet: ${NETWORK_SUBNET}

View File

@ -21,7 +21,7 @@ APPL_NAME="deluge"
APPL_NAME_FULL="Deluge" APPL_NAME_FULL="Deluge"
APPL_NAME_SHORT="deluge" APPL_NAME_SHORT="deluge"
APPL_ORG="rx3" APPL_ORG="rx3"
APPL_VERSION="1.2.4" APPL_VERSION="1.1.1"
APPL_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>' APPL_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
APPL_URL_PREFIX="${ORG_REGISTRY}/${APPL_ORG}" APPL_URL_PREFIX="${ORG_REGISTRY}/${APPL_ORG}"
@ -32,7 +32,7 @@ APPL_URL_PREFIX="${ORG_REGISTRY}/${APPL_ORG}"
# User Settings # User Settings
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
APPL_ENV="64" APPL_ENV="2"
APPL_NAME_SHORT="vir" APPL_NAME_SHORT="vir"
@ -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 | # | 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.7-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.2-mga9 - - ${PORT_MAIN} 58846 ${PORT_ADMIN} 8112 ${APPL_USER} ${APPL_GROUP}
@ -86,11 +86,6 @@ docker_service_add P2P peer2peer ${ORG_URL_PREFIX}
SERVER_CROND_ENABLED="FALSE" 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_INT="/var/spool/${P2P_IMG_NAME}"
P2P_SPOOL_EXT=".${P2P_SPOOL_INT}" P2P_SPOOL_EXT=".${P2P_SPOOL_INT}"
@ -102,7 +97,7 @@ P2P_PORT_BT_HIGH=3415
P2P_WEB_PREFIX="/" P2P_WEB_PREFIX="/"
NETWORK_SUBNET=10.10.33.0/30 NETWORK_SUBNET=10.10.33.8/30
NETWORK_ADDRESS=10.10.33.1 NETWORK_ADDRESS=10.10.33.9
NETWORK_GATEWAY=10.10.33.2 NETWORK_GATEWAY=10.10.33.10
#NETWORK_TABLE=4 NETWORK_TABLE=4