From 214492687838bfc37c75760efc7f49ab0b4f73e1 Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Sat, 14 Feb 2026 22:13:19 +0100 Subject: [PATCH] - Add ISL support, - Use now rx3-docker/server:1.3.0-mga9 image, - Rebuild for updates. --- Dockerfile | 9 ++++++++- ReadMe.txt | 3 ++- ReleaseNotes.txt | 9 +++++++++ compose.yaml | 1 + env.dist | 4 ++-- 5 files changed, 22 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index fa30fb3..73988fb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,6 +9,7 @@ ARG IMG_NAME ARG IMG_NAME_FULL ARG IMG_VERSION ARG IMG_MAINTAINER +ARG IMG_URL LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL} LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION} @@ -21,6 +22,7 @@ ARG MICROSOCKS_LIB=/var/lib/microsocks ARG MICROSOCKS_HOME=${MICROSOCKS_LIB} + #--------------------------------------------------------------------------------------------------------------- ARG MICROSOCKSD='#!/bin/bash \n\ \n\ @@ -30,6 +32,8 @@ groupmod -g ${MICROSOCKS_GID} microsocks chown -R microsocks:microsocks '${MICROSOCKS_LIB} #--------------------------------------------------------------------------------------------------------------- + + #--------------------------------------------------------------------------------------------------------------- ARG MICROSOCKSD_INI='[program:microsockd] \n\ directory='${MICROSOCKS_HOME}' \n\ @@ -37,6 +41,8 @@ command=/bin/bash -c `microsocks ${MICROSOCKS_OPTIONS}` user=microsocks' #--------------------------------------------------------------------------------------------------------------- + + #--------------------------------------------------------------------------------------------------------------- ARG MYIPD_INI='[program:myipd] \n\ directory='${MICROSOCKS_HOME}' \n\ @@ -46,7 +52,8 @@ user=microsocks' -RUN urpmi.update -a \ +RUN . /etc/profile.d/rx3.sh && isl_add ${IMG_URL} \ + && urpmi.update -a \ && urpmi --force microsocks netcat-traditional \ && mkdir ${MICROSOCKS_LIB} \ && useradd -M --home-dir ${MICROSOCKS_HOME} --password "" microsocks \ diff --git a/ReadMe.txt b/ReadMe.txt index beffffc..f9f666a 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -5,12 +5,13 @@ 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.3.0-mga9 image, - Use microsock 1.0.5, - Support DNS forwarding to avoid DNS leaking, - MyIPD service included. + Enjoy it! Your Rx3 Team. diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 1f8d231..baf17cb 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,12 @@ +------------------------------------------------------------------------------------------------------------------------------------ +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, +- Rebuild for updates. + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/MicroSocks V 1.1.4 - A. GIBERT - 2025/11/29 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/compose.yaml b/compose.yaml index d394c63..6fb80e3 100644 --- a/compose.yaml +++ b/compose.yaml @@ -19,6 +19,7 @@ services: IMG_NAME_FULL: ${SP_IMG_NAME_FULL} IMG_VERSION: ${SP_IMG_VERSION} IMG_MAINTAINER: ${SP_IMG_MAINTAINER} + IMG_URL: ${SP_IMG_URL} IMG_FROM_URL: ${SP_IMG_FROM_URL} MICORSOCKS_PORT: ${SP_PORT_MAIN_INT} diff --git a/env.dist b/env.dist index a108196..5f0fd4e 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.4" +APPL_VERSION="1.1.5" 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.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.3.0-mga9 - - 1080 1080 - - ${APPL_USER} ${APPL_GROUP}