Compare commits
10 Commits
microsocks
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 9a7c77c91b | |||
| 80cb257091 | |||
| a3123f18a6 | |||
| ec2809d453 | |||
| 7b2cf91aba | |||
| fde392fbbb | |||
| 2e6b651267 | |||
| 30c672e46f | |||
| 85b724b027 | |||
| e792cd44e9 |
14
Dockerfile
14
Dockerfile
@ -33,19 +33,27 @@ chown -R microsocks:microsocks '${MICROSOCKS_LIB}
|
||||
#---------------------------------------------------------------------------------------------------------------
|
||||
ARG MICROSOCKSD_INI='[program:microsockd] \n\
|
||||
directory='${MICROSOCKS_HOME}' \n\
|
||||
command=microsocks ${MICROSOCKS_OPTIONS} \n\
|
||||
command=/bin/bash -c `microsocks ${MICROSOCKS_OPTIONS}` \n\
|
||||
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 myip \
|
||||
&& urpmi --force microsocks netcat-traditional \
|
||||
&& 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}
|
||||
|
||||
@ -5,8 +5,10 @@ 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.7-mga9 image,
|
||||
- Use microsock 1.0.5,
|
||||
- Support DNS forwarding to avoid DNS leaking,
|
||||
- MyIPD service included.
|
||||
|
||||
|
||||
Enjoy it!
|
||||
|
||||
@ -1,3 +1,74 @@
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
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,
|
||||
- Fix MICROSOCKS_OPTIONS env variable handlig bug.
|
||||
|
||||
|
||||
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
Rx3-Docker/MicroSocks V 1.0.1 - A. GIBERT - 2025/04/21
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
@ -26,9 +26,15 @@ 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}
|
||||
MYIPD_PORT: ${SP_PORT_MYIPD_INT}
|
||||
|
||||
# healthcheck:
|
||||
# test: /opt/appl/kafka/bin/kafka-cluster.sh cluster-id --bootstrap-server localhost:${SP_PORT_MAIN_INT}
|
||||
@ -62,6 +68,7 @@ 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}
|
||||
|
||||
21
env.dist
21
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.1.4"
|
||||
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="2"
|
||||
APPL_ENV="0"
|
||||
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.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.7-mga9 - - 1080 1080 - - ${APPL_USER} ${APPL_GROUP}
|
||||
|
||||
|
||||
|
||||
@ -83,9 +83,16 @@ 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
|
||||
NETWORK_ADDRESS=10.10.33.9
|
||||
NETWORK_GATEWAY=10.10.33.10
|
||||
NETWORK_TABLE=4
|
||||
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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user