Compare commits

..

No commits in common. "master" and "microsocks-1.0.2" have entirely different histories.

5 changed files with 12 additions and 85 deletions

View File

@ -37,23 +37,15 @@ 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 nc -l -q 0 -p ${MYIPD_PORT} -c myip; done` \n\
user=microsocks'
#---------------------------------------------------------------------------------------------------------------
RUN urpmi.update -a \
&& urpmi --force microsocks netcat-traditional \
&& 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 \
&& 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 "${MYIPD_INI}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/supervisord.d/myipd.ini
&& echo -e "${MICROSOCKSD_INI}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/supervisord.d/microsocksd.ini
EXPOSE ${MICROSOCKS_PORT}

View File

@ -5,10 +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.7-mga9 image,
- Curtently based on rx3-docker/server:1.2.3-mga9 image,
- Use microsock 1.0.5,
- Support DNS forwarding to avoid DNS leaking,
- MyIPD service included.
- Support DNS forwarding to avoid DNS leaking.
Enjoy it!

View File

@ -1,70 +1,10 @@
------------------------------------------------------------------------------------------------------------------------------------
Rx3-Docker/MicroSocks V 1.1.4 - A. GIBERT - 2025/11/29
------------------------------------------------------------------------------------------------------------------------------------
- Use now rx3-docker/server:1.2.7-mga9 image.
- Rebuild for updates.
------------------------------------------------------------------------------------------------------------------------------------
Rx3-Docker/MicroSocks V 1.1.3 - A. GIBERT - 2025/09/19
------------------------------------------------------------------------------------------------------------------------------------
- Use now rx3-docker/server:1.2.6-mga9 image.
- Rebuild for updates.
------------------------------------------------------------------------------------------------------------------------------------
Rx3-Docker/MicroSocks V 1.1.2 - A. GIBERT - 2025/09/03
------------------------------------------------------------------------------------------------------------------------------------
- Fix old IP problem returned by MyIPD service.
------------------------------------------------------------------------------------------------------------------------------------
Rx3-Docker/MicroSocks V 1.1.1 - A. GIBERT - 2025/07/26
------------------------------------------------------------------------------------------------------------------------------------
- Use now rx3-docker/server:1.2.5-mga9 image.
------------------------------------------------------------------------------------------------------------------------------------
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
------------------------------------------------------------------------------------------------------------------------------------
- Fix Docker masquerading,
- Disable by default docker_tools network setup.
------------------------------------------------------------------------------------------------------------------------------------
Rx3-Docker/MicroSocks V 1.0.3 - 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/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 already installed on server image,
- Remove myip installation allready installed on server image,
- Fix MICROSOCKS_OPTIONS env variable handlig bug.

View File

@ -34,7 +34,6 @@ 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}
@ -68,7 +67,6 @@ networks:
driver: bridge
driver_opts:
com.docker.network.bridge.name: ${NETWORK_IF_NAME}
com.docker.network.bridge.enable_ip_masquerade: "false"
ipam:
config:
- subnet: ${NETWORK_SUBNET}

View File

@ -21,7 +21,7 @@ APPL_NAME="microsocks"
APPL_NAME_FULL="MicroSocks Proxy"
APPL_NAME_SHORT="micsoc"
APPL_ORG="rx3"
APPL_VERSION="1.1.4"
APPL_VERSION="1.0.2"
APPL_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
APPL_URL_PREFIX="${ORG_REGISTRY}/${APPL_ORG}"
@ -32,7 +32,7 @@ APPL_URL_PREFIX="${ORG_REGISTRY}/${APPL_ORG}"
# User Settings
#-------------------------------------------------------------------------------
APPL_ENV="0"
APPL_ENV="2"
APPL_NAME_SHORT="vir"
@ -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.7-mga9 - - 1080 1080 - - ${APPL_USER} ${APPL_GROUP}
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}
@ -90,9 +90,7 @@ 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
#NETWORK_TABLE=4
NETWORK_SUBNET=10.10.33.8/30
NETWORK_ADDRESS=10.10.33.9
NETWORK_GATEWAY=10.10.33.10
NETWORK_TABLE=4