diff --git a/Dockerfile b/Dockerfile index 73988fb..dad521e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -52,7 +52,7 @@ user=microsocks' -RUN . /etc/profile.d/rx3.sh && isl_add ${IMG_URL} \ +RUN . /etc/profile.d/rx3.sh && isl --add ${IMG_URL} \ && urpmi.update -a \ && urpmi --force microsocks netcat-traditional \ && mkdir ${MICROSOCKS_LIB} \ diff --git a/ReadMe.txt b/ReadMe.txt index f9f666a..97eace5 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -5,7 +5,7 @@ Welcome to Rx3-Docker/MicroSocks docker image! This project aims to build a MicroSocks docker image. Features: - - Curtently based on rx3-docker/server:1.3.0-mga9 image, + - Curtently based on rx3-docker/server:1.4.0-mga9 image, - Use microsock 1.0.5, - Support DNS forwarding to avoid DNS leaking, - MyIPD service included. diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index baf17cb..7e41c97 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,9 +1,19 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/MicroSocks V 1.2.0 - A. GIBERT - 2026/05/30 +------------------------------------------------------------------------------------------------------------------------------------ + +- Now use rx3-docker/server:1.4.0-mga9 image, +- Now use docker-tools-1.5.2, +- Rebuild for updates. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/MicroSocks V 1.1.5 - A. GIBERT - 2026/02/16 ------------------------------------------------------------------------------------------------------------------------------------ - Add ISL support, -- Use now rx3-docker/server:1.3.0-mga9 image, +- Now use rx3-docker/server:1.3.0-mga9 image, - Rebuild for updates. @@ -11,7 +21,7 @@ Rx3-Docker/MicroSocks V 1.1.5 - A. GIBERT - 2026/02/16 Rx3-Docker/MicroSocks V 1.1.4 - A. GIBERT - 2025/11/29 ------------------------------------------------------------------------------------------------------------------------------------ -- Use now rx3-docker/server:1.2.7-mga9 image. +- Now use rx3-docker/server:1.2.7-mga9 image. - Rebuild for updates. @@ -20,7 +30,7 @@ Rx3-Docker/MicroSocks V 1.1.4 - A. GIBERT - 2025/11/29 Rx3-Docker/MicroSocks V 1.1.3 - A. GIBERT - 2025/09/19 ------------------------------------------------------------------------------------------------------------------------------------ -- Use now rx3-docker/server:1.2.6-mga9 image. +- Now use rx3-docker/server:1.2.6-mga9 image. - Rebuild for updates. @@ -37,7 +47,7 @@ Rx3-Docker/MicroSocks V 1.1.2 - A. GIBERT - 2025/09/03 Rx3-Docker/MicroSocks V 1.1.1 - A. GIBERT - 2025/07/26 ------------------------------------------------------------------------------------------------------------------------------------ -- Use now rx3-docker/server:1.2.5-mga9 image. +- Now use rx3-docker/server:1.2.5-mga9 image. @@ -62,7 +72,7 @@ Rx3-Docker/MicroSocks V 1.0.4 - A. GIBERT - 2025/07/03 Rx3-Docker/MicroSocks V 1.0.3 - A. GIBERT - 2025/06/26 ------------------------------------------------------------------------------------------------------------------------------------ -- Use now rx3-docker/server:1.2.4-mga9 image, +- Now use rx3-docker/server:1.2.4-mga9 image, - DNS re-run config bug on a already created container fixed by new server image. @@ -71,7 +81,7 @@ Rx3-Docker/MicroSocks V 1.0.3 - A. GIBERT - 2025/06/26 Rx3-Docker/MicroSocks V 1.0.2 - A. GIBERT - 2025/05/28 ------------------------------------------------------------------------------------------------------------------------------------ -- Use now rx3-docker/server:1.2.3-mga9 image, +- Now use 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. @@ -82,7 +92,7 @@ Rx3-Docker/MicroSocks V 1.0.2 - A. GIBERT - 2025/05/28 Rx3-Docker/MicroSocks V 1.0.1 - A. GIBERT - 2025/04/21 ------------------------------------------------------------------------------------------------------------------------------------ -- Use now rx3-docker/server:1.2.2-mga9 image. +- Now use rx3-docker/server:1.2.2-mga9 image. diff --git a/env.dist b/env.dist index 5f0fd4e..e7f9d11 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.1.5" +APPL_VERSION="1.2.0" 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.3.0-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.4.0-mga9 - - 1080 1080 - - ${APPL_USER} ${APPL_GROUP}