diff --git a/service b/service index 20ab6ed..7f07468 100644 --- a/service +++ b/service @@ -19,29 +19,7 @@ touch $HOST_FILE; VOLUME_MOUNTS=""; -if [ -d /etc/user/data ]; then - VOLUME_MOUNTS=$VOLUME_MOUNTS" -v /etc/user/data:/etc/user/data" -fi - -if [ -d /etc/user/config ]; then - VOLUME_MOUNTS=$VOLUME_MOUNTS" -v /etc/user/config:/etc/user/config" -fi - -if [ -d /etc/user/secret ]; then - VOLUME_MOUNTS=$VOLUME_MOUNTS" -v /etc/user/secret:/etc/user/secret" -fi - -if [ -d /etc/system/data ]; then - VOLUME_MOUNTS=$VOLUME_MOUNTS" -v /etc/system/data:/etc/system/data" -fi - -if [ -d /etc/system/config ]; then - VOLUME_MOUNTS=$VOLUME_MOUNTS" -v /etc/system/config:/etc/system/config" -fi - -if [ -d /etc/system/log ]; then - VOLUME_MOUNTS=$VOLUME_MOUNTS" -v /etc/system/log:/etc/system/log" -fi +VOLUME_MOUNTS="-v SYSTEM_DATA:/etc/system/data -v SYSTEM_CONFIG:/etc/system/config -v SYSTEM_LOG:/etc/system/log -v USER_DATA:/etc/user/data -v USER_CONFIG:/etc/user/config -v USER_SECRET:/etc/user/secret" CA_PATH=/etc/system/data/ssl/certs CA="--env CA_PATH=$CA_PATH" @@ -60,4 +38,4 @@ $VOLUME_MOUNTS \ --env HOST_FILE=$HOST_FILE \ $DOCKER_REGISTRY_URL$SETUP:$SETUP_VERSION" -$service_exec $SERVICE_FILE start +$service_exec $SERVICE_FILE start info