Commit a061c32a authored by Philipp's avatar Philipp
Browse files

fixed loading of configuration file for building dockeropts

parent ce712b66
......@@ -1020,9 +1020,16 @@ function docker_remove_image() {
}
function docker_buildopts() {
read_fidianconfig "/home/fido/.fidianconfig"
dockeropts="-v fidian_husky:/etc/husky -v fidian_binkd:/etc/binkd -v fidian_logs:/var/log/fidian -v fidian_data:/var/spool/ftn -e YOUR_SYSTEM='${CFG[YOUR_SYSTEM]}' -e YOUR_LOCATION='${CFG[YOUR_LOCATION]}' -e YOUR_HOSTNAME='${CFG[YOUR_HOSTNAME]}' -e ENABLE_TTYD='${CFG[ENABLE_TTYD]}' -e WEB_PASSWORD='${CFG[WEB_PASSWORD]}' "
for c in $(seq 1 $( grep -c LINK_NAME_ /home/fido/.fidianconfig 2>/dev/null ))
read_fidianconfig ${TMP}/.fidianconfig
ports="-p 24554:24554"
if [ "${CFG[ENABLE_TTYD]}" == "1" ]
then
ports="${ports} -p 24580:24580"
fi
dockeropts="${ports} -v fidian_husky:/etc/husky -v fidian_binkd:/etc/binkd -v fidian_logs:/var/log/fidian -v fidian_data:/var/spool/ftn -e YOUR_SYSTEM='${CFG[YOUR_SYSTEM]}' -e YOUR_LOCATION='${CFG[YOUR_LOCATION]}' -e YOUR_HOSTNAME='${CFG[YOUR_HOSTNAME]}' -e ENABLE_TTYD='${CFG[ENABLE_TTYD]}' -e WEB_PASSWORD='${CFG[WEB_PASSWORD]}' "
for c in $(seq 1 $( grep -c LINK_NAME_ ${TMP}/.fidianconfig 2>/dev/null ))
do
for n in $(seq 1 ${#CFGOPTIONS[@]} )
do
......@@ -1036,13 +1043,7 @@ function docker_buildopts() {
fi
done
done
ports="-p 24554:24554"
if [ "$CFG[ENABLE_TTYD]" == "1" ]
then
ports="$ports -p 24580:24580"
fi
dockeropts="${ports} ${dockeropts}-e TZ='${TZ}'"
dockeropts="${dockeropts}-e TZ='${TZ}'"
}
function docker_run() {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment