diff --git a/Dockerfile b/Dockerfile index 9fce7b5..b1038d1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,6 @@ LABEL maintainer=${IMG_MAINTAINER} ARG MICROSOCKS_PORT ARG MICROSOCKS_LIB=/var/lib/microsocks -ARG MICROSOCKS_LOG=/var/log/microsocks ARG MICROSOCKS_HOME=${MICROSOCKS_LIB} @@ -28,13 +27,13 @@ ARG MICROSOCKSD='#!/bin/bash usermod -u ${MICROSOCKS_UID} microsocks \n\ groupmod -g ${MICROSOCKS_GID} microsocks \n\ \n\ -chown -R microsocks:microsocks '${MICROSOCKS_LOG} +chown -R microsocks:microsocks '${MICROSOCKS_LIB} #--------------------------------------------------------------------------------------------------------------- #--------------------------------------------------------------------------------------------------------------- ARG MICROSOCKSD_INI='[program:microsockd] \n\ directory='${MICROSOCKS_HOME}' \n\ -command=microsocks ${MICROSOCKS_OPTIONS} > '${MICROSOCKS_LOG}/microsocks.log' \n\ +command=microsocks ${MICROSOCKS_OPTIONS} \n\ user=microsocks' #--------------------------------------------------------------------------------------------------------------- @@ -42,7 +41,7 @@ user=microsocks' RUN urpmi.update -a \ && urpmi --force microsocks \ - && mkdir ${MICROSOCKS_LIB} ${MICROSOCKS_LOG} \ + && mkdir ${MICROSOCKS_LIB} \ && 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 \ diff --git a/compose.yaml b/compose.yaml index 8bf35c4..f146ff0 100644 --- a/compose.yaml +++ b/compose.yaml @@ -7,7 +7,7 @@ services: #------------------------------------------------------------------------------- - socks-server: + socks-proxy: container_name: ${SP_HOST_NAME} hostname: ${SP_HOST_NAME} @@ -42,7 +42,7 @@ services: # - ./${SP_LIB_EXT}:${SP_LIB_INT} - ./${SP_LOG_INIT_EXT}:${SP_LOG_INIT_INT} - ./${SP_LOG_SV_EXT}:${SP_LOG_SV_INT} - - ./${SP_LOG_MAIN_EXT}:${SP_LOG_MAIN_INT} +# - ./${SP_LOG_MAIN_EXT}:${SP_LOG_MAIN_INT} networks: proxy: