From fde392fbbb59ffce17234b506930226c9e0e73a3 Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Mon, 7 Jul 2025 14:42:27 +0200 Subject: [PATCH] - Add MyIPD service on port 8080. --- Dockerfile | 12 ++++++++++-- ReadMe.txt | 3 ++- ReleaseNotes.txt | 8 ++++++++ compose.yaml | 1 + env.dist | 4 +++- 5 files changed, 24 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 651d41b..ddc887c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,15 +37,23 @@ command=/bin/bash -c `microsocks ${MICROSOCKS_OPTIONS}` user=microsocks' #--------------------------------------------------------------------------------------------------------------- +#--------------------------------------------------------------------------------------------------------------- +ARG MYIPD_INI='[program:myipd] \n\ +directory='${MICROSOCKS_HOME}' \n\ +command=/bin/bash -c `while true; do myip | nc -l -q 0 ${MYIPD_PORT}; done` \n\ +user=microsocks' +#--------------------------------------------------------------------------------------------------------------- + RUN urpmi.update -a \ - && urpmi --force microsocks \ + && urpmi --force microsocks netcat-openbsd \ && mkdir ${MICROSOCKS_LIB} \ && useradd -M --home-dir ${MICROSOCKS_HOME} --password "" microsocks \ && echo -e "${MICROSOCKSD}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/microsocksd \ && chmod a+x /etc/init.d/microsocksd \ && ln -s /etc/init.d/microsocksd /etc/rcD.d/S30microsocksd \ - && echo -e "${MICROSOCKSD_INI}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/supervisord.d/microsocksd.ini + && echo -e "${MICROSOCKSD_INI}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/supervisord.d/microsocksd.ini \ + && echo -e "${MYIPD_INI}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/supervisord.d/myipd.ini EXPOSE ${MICROSOCKS_PORT} diff --git a/ReadMe.txt b/ReadMe.txt index 9df3071..241573d 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -7,7 +7,8 @@ This project aims to build a MicroSocks docker image. Features: - Curtently based on rx3-docker/server:1.2.4-mga9 image, - Use microsock 1.0.5, - - Support DNS forwarding to avoid DNS leaking. + - Support DNS forwarding to avoid DNS leaking, + - MyIPD service included. Enjoy it! diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 2b94ebd..513d77f 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,11 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/MicroSocks V 1.1.0 - A. GIBERT - 2025/07/07 +------------------------------------------------------------------------------------------------------------------------------------ + +- Add MyIPD service on port 8080. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/MicroSocks V 1.0.4 - A. GIBERT - 2025/07/03 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/compose.yaml b/compose.yaml index f3bf535..d394c63 100644 --- a/compose.yaml +++ b/compose.yaml @@ -34,6 +34,7 @@ services: MICROSOCKS_UID: ${SP_USER_ID} MICROSOCKS_GID: ${SP_GROUP_ID} MICROSOCKS_OPTIONS: ${SP_CMD_OPTIONS} + MYIPD_PORT: ${SP_PORT_MYIPD_INT} # healthcheck: # test: /opt/appl/kafka/bin/kafka-cluster.sh cluster-id --bootstrap-server localhost:${SP_PORT_MAIN_INT} diff --git a/env.dist b/env.dist index 29df528..3e428c5 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.4" +APPL_VERSION="1.1.0" APPL_MAINTAINER='"Arnaud G. GIBERT" ' APPL_URL_PREFIX="${ORG_REGISTRY}/${APPL_ORG}" @@ -90,6 +90,8 @@ SERVER_DNS_SEARCH="xor.rx3 and.rx3 not.rx3 mob.rx3 fix.rx3 rx3 rx3.net" SP_CMD_OPTIONS="" +SP_PORT_MYIPD_INT="8080" + NETWORK_SUBNET=10.10.32.0/30 NETWORK_ADDRESS=10.10.32.1 NETWORK_GATEWAY=10.10.32.2