From 47993693f1e6988f46b54c4342fd83613b1b87f2 Mon Sep 17 00:00:00 2001
From: "Arnaud G. GIBERT" <arnaud@rx3.net>
Date: Sat, 5 Apr 2025 12:36:37 +0200
Subject: [PATCH] - Fix Dockerfile & compose.

---
 Dockerfile   | 18 +++++++++++-------
 compose.yaml |  2 +-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 56d278d..9fce7b5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,29 +17,33 @@ LABEL maintainer=${IMG_MAINTAINER}
 
 ARG MICROSOCKS_PORT
 
+ARG MICROSOCKS_LIB=/var/lib/microsocks
 ARG MICROSOCKS_LOG=/var/log/microsocks
+ARG MICROSOCKS_HOME=${MICROSOCKS_LIB}
 
 
 #---------------------------------------------------------------------------------------------------------------
 ARG MICROSOCKSD='#!/bin/bash                                                                                 \n\
                                                                                                              \n\
-usermod  -u ${MICROSOCKS_UID} microsock                                                                      \n\
-groupmod -g ${MICROSOCKS_GID} microsock                                                                      \n\
+usermod  -u ${MICROSOCKS_UID} microsocks                                                                     \n\
+groupmod -g ${MICROSOCKS_GID} microsocks                                                                     \n\
                                                                                                              \n\
-chown -R microsock:microsock '${MICROSOCKS_LOG}
+chown -R microsocks:microsocks '${MICROSOCKS_LOG}
 #---------------------------------------------------------------------------------------------------------------
 
 #---------------------------------------------------------------------------------------------------------------
 ARG MICROSOCKSD_INI='[program:microsockd]                                                                    \n\
-command=microsock ${MICROSOCKS_OPTIONS} > '${MICROSOCKS_LOG}'                                                \n\
-user=microsock'
+directory='${MICROSOCKS_HOME}'                                                                               \n\
+command=microsocks ${MICROSOCKS_OPTIONS} > '${MICROSOCKS_LOG}/microsocks.log'                                \n\
+user=microsocks'
 #---------------------------------------------------------------------------------------------------------------
 
 
 
 RUN    urpmi.update -a                                                                                         \
-       urpmi --force microsocks                                                                                \
-    && mkdir        ${MICROSOCKS_LOG}                                                                          \
+    && urpmi --force microsocks                                                                                \
+    && mkdir        ${MICROSOCKS_LIB} ${MICROSOCKS_LOG}                                                        \
+    && 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                                          \
diff --git a/compose.yaml b/compose.yaml
index 6a9b683..8bf35c4 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -7,7 +7,7 @@ services:
 
 #-------------------------------------------------------------------------------
 
-  topic-server:
+  socks-server:
     container_name:                 ${SP_HOST_NAME}
     hostname:                       ${SP_HOST_NAME}