From e792cd44e95718656704f66b617f2b451b5c3ac1 Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Wed, 28 May 2025 18:52:56 +0200 Subject: [PATCH] - Use now rx3-docker/server:1.2.3-mga9 image, - Enable DNS forwarding to prevent DNS leak! - Remove myip installation allready installed on server image. --- Dockerfile | 2 +- ReadMe.txt | 5 +++-- ReleaseNotes.txt | 10 ++++++++++ compose.yaml | 5 +++++ env.dist | 9 +++++++-- 5 files changed, 26 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 65e33a5..b1038d1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,7 +40,7 @@ user=microsocks' RUN urpmi.update -a \ - && urpmi --force microsocks myip \ + && urpmi --force microsocks \ && mkdir ${MICROSOCKS_LIB} \ && useradd -M --home-dir ${MICROSOCKS_HOME} --password "" microsocks \ && echo -e "${MICROSOCKSD}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/microsocksd \ diff --git a/ReadMe.txt b/ReadMe.txt index 79671f7..f7b7c62 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -5,8 +5,9 @@ Welcome to Rx3-Docker/MicroSocks docker image! This project aims to build a MicroSocks docker image. Features: - - Curtently based on rx3-docker/server:1.2.2-mga9 image, - - Use microsock 1.0.5. + - Curtently based on rx3-docker/server:1.2.3-mga9 image, + - Use microsock 1.0.5, + - Support DNS forwarding to avoid DNS leaking. Enjoy it! diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 4f924c8..4c45eb8 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,13 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/MicroSocks V 1.0.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 allready installed on server image. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/MicroSocks V 1.0.1 - A. GIBERT - 2025/04/21 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/compose.yaml b/compose.yaml index f146ff0..0d4d866 100644 --- a/compose.yaml +++ b/compose.yaml @@ -26,6 +26,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} MICROSOCKS_UID: ${SP_USER_ID} MICROSOCKS_GID: ${SP_GROUP_ID} MICROSOCKS_OPTIONS: ${SP_CMD_OPTIONS} diff --git a/env.dist b/env.dist index 4067316..7522248 100644 --- a/env.dist +++ b/env.dist @@ -21,7 +21,7 @@ APPL_NAME="microsocks" APPL_NAME_FULL="MicroSocks Proxy" APPL_NAME_SHORT="micsoc" APPL_ORG="rx3" -APPL_VERSION="1.0.1" +APPL_VERSION="1.0.2" APPL_MAINTAINER='"Arnaud G. GIBERT" ' APPL_URL_PREFIX="${ORG_REGISTRY}/${APPL_ORG}" @@ -73,7 +73,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 SP socks-proxy ${ORG_URL_PREFIX} microsocks "Rx3-Docker/MicroSocks" ${APPL_VERSION}-mga9 ${ORG_URL_PREFIX} server 1.2.2-mga9 - - 1080 1080 - - apache apache +docker_service_add SP socks-proxy ${ORG_URL_PREFIX} microsocks "Rx3-Docker/MicroSocks" ${APPL_VERSION}-mga9 ${ORG_URL_PREFIX} server 1.2.3-mga9 - - 1080 1080 - - ${APPL_USER} ${APPL_GROUP} @@ -83,6 +83,11 @@ docker_service_add SP socks-proxy ${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" + SP_CMD_OPTIONS="" NETWORK_SUBNET=10.10.33.8/30