diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 33eab1c..2b94ebd 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,12 @@ +------------------------------------------------------------------------------------------------------------------------------------ +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 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/compose.yaml b/compose.yaml index 0d4d866..f3bf535 100644 --- a/compose.yaml +++ b/compose.yaml @@ -67,6 +67,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} diff --git a/env.dist b/env.dist index b49f6e3..29df528 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.3" +APPL_VERSION="1.0.4" APPL_MAINTAINER='"Arnaud G. GIBERT" ' 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" @@ -90,7 +90,7 @@ 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 +NETWORK_SUBNET=10.10.32.0/30 +NETWORK_ADDRESS=10.10.32.1 +NETWORK_GATEWAY=10.10.32.2 +#NETWORK_TABLE=4