flywithu/kopano-docker
1
0
Fork 0
mirror of https://github.com/zokradonh/kopano-docker synced 2025-06-09 00:46:25 +00:00
Code Issues Releases Wiki Activity

unsed kcconf_ env variables before starting up the individual services

Browse Source 
fixes https://github.com/zokradonh/kopano-docker/issues/4

Signed-off-by: Felix Bartels <felix@host-consultants.de>
This commit is contained in:
Felix Bartels 2018-11-21 10:38:11 +01:00
parent 58081c9d41
commit 07ea7b92bf
3 changed files with 39 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
core/start-service.sh
View File

@ -38,49 +38,63 @@ case "$SERVICE_TO_START" in
server) server)
/kopano/services/kopano-public-store.sh & /kopano/services/kopano-public-store.sh &
/kopano/services/kopano-users.sh & /kopano/services/kopano-users.sh &
exec dockerize \ dockerize \
-wait file://$KCCONF_SERVER_SERVER_SSL_CA_FILE \ -wait file://$KCCONF_SERVER_SERVER_SSL_CA_FILE \
-wait file://$KCCONF_SERVER_SERVER_SSL_KEY_FILE \ -wait file://$KCCONF_SERVER_SERVER_SSL_KEY_FILE \
-wait tcp://db:3306 \ -wait tcp://db:3306 \
-timeout 360s \ -timeout 360s
/usr/sbin/kopano-server -F # cleaning up env variables
unset "${!KCCONF_@}"
exec /usr/sbin/kopano-server -F
;; ;;
dagent) dagent)
exec dockerize \ dockerize \
-wait file://var/run/kopano/server.sock \ -wait file://var/run/kopano/server.sock \
-timeout 360s \ -timeout 360s
/usr/sbin/kopano-dagent -l # cleaning up env variables
unset "${!KCCONF_@}"
exec /usr/sbin/kopano-dagent -l
;; ;;
gateway) gateway)
exec dockerize \ dockerize \
-wait tcp://kserver:236 \ -wait tcp://kserver:236 \
-timeout 360s \ -timeout 360s
/usr/sbin/kopano-gateway -F # cleaning up env variables
unset "${!KCCONF_@}"
exec /usr/sbin/kopano-gateway -F
;; ;;
ical) ical)
exec dockerize \ dockerize \
-wait tcp://kserver:236 \ -wait tcp://kserver:236 \
-timeout 360s \ -timeout 360s
/usr/sbin/kopano-ical -F # cleaning up env variables
unset "${!KCCONF_@}"
exec /usr/sbin/kopano-ical -F
;; ;;
monitor) monitor)
exec dockerize \ dockerize \
-wait file://var/run/kopano/server.sock \ -wait file://var/run/kopano/server.sock \
-timeout 360s \ -timeout 360s
/usr/sbin/kopano-monitor -F # cleaning up env variables
unset "${!KCCONF_@}"
exec /usr/sbin/kopano-monitor -F
;; ;;
search) search)
exec dockerize \ dockerize \
-wait file://var/run/kopano/server.sock \ -wait file://var/run/kopano/server.sock \
-timeout 360s \ -timeout 360s
/usr/bin/python /usr/sbin/kopano-search -F # cleaning up env variables
unset "${!KCCONF_@}"
exec /usr/bin/python /usr/sbin/kopano-search -F
;; ;;
spooler) spooler)
exec dockerize \ dockerize \
-wait file://var/run/kopano/server.sock \ -wait file://var/run/kopano/server.sock \
-wait tcp://mail:25 \ -wait tcp://mail:25 \
-timeout 1080s \ -timeout 1080s
/usr/sbin/kopano-spooler -F # cleaning up env variables
unset "${!KCCONF_@}"
exec /usr/sbin/kopano-spooler -F
;; ;;
*) *)
echo "Failed to start: Unknown service name: '$SERVICE_TO_START'" | ts echo "Failed to start: Unknown service name: '$SERVICE_TO_START'" | ts

2
webapp/start.sh
View File

@ -38,4 +38,6 @@ echo "Starting Apache"
rm -f /run/apache2/apache2.pid rm -f /run/apache2/apache2.pid
set +u set +u
source /etc/apache2/envvars source /etc/apache2/envvars
# cleaning up env variables
unset "${!KCCONF_@}"
exec /usr/sbin/apache2 -DFOREGROUND exec /usr/sbin/apache2 -DFOREGROUND

2
zpush/start.sh
View File

@ -43,4 +43,6 @@ echo "Starting Apache"
rm -f /run/apache2/apache2.pid rm -f /run/apache2/apache2.pid
set +u set +u
source /etc/apache2/envvars source /etc/apache2/envvars
# cleaning up env variables
unset "${!KCCONF_@}"
exec /usr/sbin/apache2 -DFOREGROUND exec /usr/sbin/apache2 -DFOREGROUND