Lea/Docker-DocumentServer
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix ^M after sed

Browse source
This commit is contained in:
danilapog 2022-07-11 17:18:06 +03:00
parent 9755dff742
commit cc89c6d299
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
run-document-server.sh
View file

@ -173,7 +173,8 @@ update_supervisor_config() {
if [[ -z ${RESULT} ]]; then if [[ -z ${RESULT} ]]; then
for file in ${SUPERVISOR_CONF_DIR}/ds-converter.conf ${SUPERVISOR_CONF_DIR}/ds-docservice.conf for file in ${SUPERVISOR_CONF_DIR}/ds-converter.conf ${SUPERVISOR_CONF_DIR}/ds-docservice.conf
do do
sed -i "s|environment.*|&\,NODE_OPTIONS=${NODE_OPTIONS}|g" $file sed -i -e "s|environment.*|&\,NODE_OPTIONS=${NODE_OPTIONS}|g" $file &> /dev/null
sed -i 's/\r//g' $file &> /dev/null
done done
fi fi
fi fi
@ -483,7 +484,7 @@ update_nginx_settings(){
sed 's/linux/docker/' -i ${NGINX_ONLYOFFICE_EXAMPLE_CONF} sed 's/linux/docker/' -i ${NGINX_ONLYOFFICE_EXAMPLE_CONF}
fi fi
documentserver-update-securelink.sh -s ${SECURE_LINK_SECRET:-$(pwgen -s 20)} documentserver-update-securelink.sh -s ${SECURE_LINK_SECRET:-$(pwgen -s 20)} false
} }
update_supervisor_settings(){ update_supervisor_settings(){