- Fix Dockerfile & compose.

This commit is contained in:
Arnaud G. GIBERT 2025-04-05 12:36:37 +02:00
parent 435e416e97
commit 47993693f1
2 changed files with 12 additions and 8 deletions

View File

@ -17,29 +17,33 @@ LABEL maintainer=${IMG_MAINTAINER}
ARG MICROSOCKS_PORT ARG MICROSOCKS_PORT
ARG MICROSOCKS_LIB=/var/lib/microsocks
ARG MICROSOCKS_LOG=/var/log/microsocks ARG MICROSOCKS_LOG=/var/log/microsocks
ARG MICROSOCKS_HOME=${MICROSOCKS_LIB}
#--------------------------------------------------------------------------------------------------------------- #---------------------------------------------------------------------------------------------------------------
ARG MICROSOCKSD='#!/bin/bash \n\ ARG MICROSOCKSD='#!/bin/bash \n\
\n\ \n\
usermod -u ${MICROSOCKS_UID} microsock \n\ usermod -u ${MICROSOCKS_UID} microsocks \n\
groupmod -g ${MICROSOCKS_GID} microsock \n\ groupmod -g ${MICROSOCKS_GID} microsocks \n\
\n\ \n\
chown -R microsock:microsock '${MICROSOCKS_LOG} chown -R microsocks:microsocks '${MICROSOCKS_LOG}
#--------------------------------------------------------------------------------------------------------------- #---------------------------------------------------------------------------------------------------------------
#--------------------------------------------------------------------------------------------------------------- #---------------------------------------------------------------------------------------------------------------
ARG MICROSOCKSD_INI='[program:microsockd] \n\ ARG MICROSOCKSD_INI='[program:microsockd] \n\
command=microsock ${MICROSOCKS_OPTIONS} > '${MICROSOCKS_LOG}' \n\ directory='${MICROSOCKS_HOME}' \n\
user=microsock' command=microsocks ${MICROSOCKS_OPTIONS} > '${MICROSOCKS_LOG}/microsocks.log' \n\
user=microsocks'
#--------------------------------------------------------------------------------------------------------------- #---------------------------------------------------------------------------------------------------------------
RUN urpmi.update -a \ RUN urpmi.update -a \
urpmi --force microsocks \ && urpmi --force microsocks \
&& mkdir ${MICROSOCKS_LOG} \ && 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 \ && echo -e "${MICROSOCKSD}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/microsocksd \
&& chmod a+x /etc/init.d/microsocksd \ && chmod a+x /etc/init.d/microsocksd \
&& ln -s /etc/init.d/microsocksd /etc/rcD.d/S30microsocksd \ && ln -s /etc/init.d/microsocksd /etc/rcD.d/S30microsocksd \

View File

@ -7,7 +7,7 @@ services:
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
topic-server: socks-server:
container_name: ${SP_HOST_NAME} container_name: ${SP_HOST_NAME}
hostname: ${SP_HOST_NAME} hostname: ${SP_HOST_NAME}