Compare commits
8 Commits
deluge-1.1
...
deluge-1.2
| Author | SHA1 | Date | |
|---|---|---|---|
| 229e67796b | |||
| a90d38f01b | |||
| 1a4b68ea89 | |||
| 97e1a607d5 | |||
| c903a8463d | |||
| 11c4307315 | |||
| 9b60671ac8 | |||
| c353ecec79 |
24
Dockerfile
24
Dockerfile
@@ -9,6 +9,7 @@ ARG IMG_NAME
|
|||||||
ARG IMG_NAME_FULL
|
ARG IMG_NAME_FULL
|
||||||
ARG IMG_VERSION
|
ARG IMG_VERSION
|
||||||
ARG IMG_MAINTAINER
|
ARG IMG_MAINTAINER
|
||||||
|
ARG IMG_URL
|
||||||
|
|
||||||
LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL}
|
LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL}
|
||||||
LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION}
|
LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION}
|
||||||
@@ -26,6 +27,7 @@ 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\
|
||||||
@@ -54,6 +56,8 @@ done
|
|||||||
chown -R deluge:deluge '${DELUGE_LIB}' '${DELUGE_SPOOL}
|
chown -R deluge:deluge '${DELUGE_LIB}' '${DELUGE_SPOOL}
|
||||||
#-----------------------------------------------------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#-----------------------------------------------------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------------------------------------------------
|
||||||
ARG DELUGED_INI='[program:deluged] \n\
|
ARG DELUGED_INI='[program:deluged] \n\
|
||||||
directory='${DELUGE_HOME}' \n\
|
directory='${DELUGE_HOME}' \n\
|
||||||
@@ -64,14 +68,26 @@ environment=HOME='${DELUGE_HOME}
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
RUN urpmi.update -a \
|
#-----------------------------------------------------------------------------------------------------------------------
|
||||||
&& urpmi --force deluge myip --no-recommends \
|
ARG DELUGE_WEB_INI='[program:deluge_web] \n\
|
||||||
|
directory='${DELUGE_HOME}' \n\
|
||||||
|
command=/bin/bash -c `deluge-web --config '${DELUGE_CONFIG}' --base ${DELUGE_WEB_PREFIX} --do-not-daemonize` \n\
|
||||||
|
user=deluge \n\
|
||||||
|
environment=HOME='${DELUGE_HOME}
|
||||||
|
#-----------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
RUN . /etc/profile.d/rx3.sh && isl_add ${IMG_URL} \
|
||||||
&& useradd --home-dir ${DELUGE_HOME} --password "" deluge \
|
&& useradd --home-dir ${DELUGE_HOME} --password "" deluge \
|
||||||
|
&& urpmi.update -a \
|
||||||
|
&& urpmi --force deluge --no-recommends \
|
||||||
&& 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 \
|
||||||
&& ln -s /etc/init.d/deluged /etc/rcD.d/S30deluged \
|
&& ln -s /etc/init.d/deluged /etc/rcD.d/S30deluged \
|
||||||
&& echo -e "${DELUGED_INI}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/supervisord.d/deluged.ini
|
&& echo -e "${DELUGED_INI}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/supervisord.d/deluged.ini \
|
||||||
|
&& echo -e "${DELUGE_WEB_INI}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/supervisord.d/deluge_web.ini
|
||||||
|
|
||||||
ADD ${MODULE_PATH} ${DELUGE_CONFIG_TEMPLATE}
|
ADD ${MODULE_PATH} ${DELUGE_CONFIG_TEMPLATE}
|
||||||
|
|
||||||
|
|||||||
@@ -5,10 +5,11 @@ 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.1.1 & rx3-docker/server:1.2.2-mga9 image,
|
- Curtently based on deluge 2.2.0 & rx3-docker/server:1.3.0-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.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,78 @@
|
|||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
Rx3-Docker/Deluge V 1.2.5 - A. GIBERT - 2026/02/16
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
- Add ISL support,
|
||||||
|
- Use now rx3-docker/server:1.3.0-mga9 image,
|
||||||
|
- Rebuild for updates.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
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
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
- Update to deluge 2.1.1 + Patch web base filename,
|
||||||
|
- Add P2P_WEB_PREFIX env variable support,
|
||||||
|
- Move back web port to standard 8112,
|
||||||
|
- Disable WebUi plugin and start Web daemon.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
Rx3-Docker/Deluge V 1.1.0 - A. GIBERT - 2025/05/25
|
Rx3-Docker/Deluge V 1.1.0 - A. GIBERT - 2025/05/25
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ services:
|
|||||||
IMG_NAME_FULL: ${P2P_IMG_NAME_FULL}
|
IMG_NAME_FULL: ${P2P_IMG_NAME_FULL}
|
||||||
IMG_VERSION: ${P2P_IMG_VERSION}
|
IMG_VERSION: ${P2P_IMG_VERSION}
|
||||||
IMG_MAINTAINER: ${P2P_IMG_MAINTAINER}
|
IMG_MAINTAINER: ${P2P_IMG_MAINTAINER}
|
||||||
|
IMG_URL: ${P2P_IMG_URL}
|
||||||
IMG_FROM_URL: ${P2P_IMG_FROM_URL}
|
IMG_FROM_URL: ${P2P_IMG_FROM_URL}
|
||||||
|
|
||||||
MODULE_PATH: ${P2P_MODULE_PATH}
|
MODULE_PATH: ${P2P_MODULE_PATH}
|
||||||
@@ -30,10 +31,16 @@ 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}
|
||||||
DELUGE_PORT_BT_HIGH: ${P2P_PORT_BT_HIGH}
|
DELUGE_PORT_BT_HIGH: ${P2P_PORT_BT_HIGH}
|
||||||
|
DELUGE_WEB_PREFIX: ${P2P_WEB_PREFIX}
|
||||||
|
|
||||||
# healthcheck:
|
# healthcheck:
|
||||||
# test: /opt/appl/kafka/bin/kafka-cluster.sh cluster-id --bootstrap-server localhost:${P2P_PORT_MAIN_INT}
|
# test: /opt/appl/kafka/bin/kafka-cluster.sh cluster-id --bootstrap-server localhost:${P2P_PORT_MAIN_INT}
|
||||||
@@ -69,6 +76,7 @@ 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}
|
||||||
|
|||||||
21
env.dist
21
env.dist
@@ -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.1.0"
|
APPL_VERSION="1.2.5"
|
||||||
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="2"
|
APPL_ENV="64"
|
||||||
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.2-mga9 - - ${PORT_MAIN} 58846 ${PORT_ADMIN} 80 ${APPL_USER} ${APPL_GROUP}
|
docker_service_add P2P peer2peer ${ORG_URL_PREFIX} deluge "Rx3-Docker/Deluge" ${APPL_VERSION}-mga9 ${ORG_URL_PREFIX} server 1.3.0-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_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}"
|
||||||
|
|
||||||
@@ -95,7 +100,9 @@ P2P_SPOOL_EXT=".${P2P_SPOOL_INT}"
|
|||||||
P2P_PORT_BT_LOW=3400
|
P2P_PORT_BT_LOW=3400
|
||||||
P2P_PORT_BT_HIGH=3415
|
P2P_PORT_BT_HIGH=3415
|
||||||
|
|
||||||
NETWORK_SUBNET=10.10.33.8/30
|
P2P_WEB_PREFIX="/"
|
||||||
NETWORK_ADDRESS=10.10.33.9
|
|
||||||
NETWORK_GATEWAY=10.10.33.10
|
NETWORK_SUBNET=10.10.33.0/30
|
||||||
NETWORK_TABLE=4
|
NETWORK_ADDRESS=10.10.33.1
|
||||||
|
NETWORK_GATEWAY=10.10.33.2
|
||||||
|
#NETWORK_TABLE=4
|
||||||
|
|||||||
@@ -19,8 +19,7 @@
|
|||||||
"AutoAdd",
|
"AutoAdd",
|
||||||
"Label",
|
"Label",
|
||||||
"Stats",
|
"Stats",
|
||||||
"TotalTraffic",
|
"TotalTraffic"
|
||||||
"WebUi"
|
|
||||||
],
|
],
|
||||||
"enc_in_policy": 1,
|
"enc_in_policy": 1,
|
||||||
"enc_level": 2,
|
"enc_level": 2,
|
||||||
|
|||||||
@@ -11,9 +11,9 @@
|
|||||||
"interface": "0.0.0.0",
|
"interface": "0.0.0.0",
|
||||||
"language": "",
|
"language": "",
|
||||||
"pkey": "ssl/daemon.pkey",
|
"pkey": "ssl/daemon.pkey",
|
||||||
"port": 80,
|
"port": 8112,
|
||||||
"pwd_salt": "682e25a24cbb391ef5f19092841e5beab388e714",
|
"pwd_salt": "9dc38672f73e72d2f8c7c90cb87ae3eef624e1e7",
|
||||||
"pwd_sha1": "8b555cafbc04a092446b4d434bede2158925f57d",
|
"pwd_sha1": "7a06f92f8e040d443851fc885d49d25b04650de7",
|
||||||
"session_timeout": 3600,
|
"session_timeout": 3600,
|
||||||
"sessions": {},
|
"sessions": {},
|
||||||
"show_session_speed": false,
|
"show_session_speed": false,
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
{
|
|
||||||
"file": 1,
|
|
||||||
"format": 1
|
|
||||||
}{
|
|
||||||
"enabled": true,
|
|
||||||
"port": 80,
|
|
||||||
"ssl": false
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user