diff --git a/core/start-service.sh b/core/start-service.sh index 636e9e8..e77ae5d 100755 --- a/core/start-service.sh +++ b/core/start-service.sh @@ -38,49 +38,63 @@ case "$SERVICE_TO_START" in server) /kopano/services/kopano-public-store.sh & /kopano/services/kopano-users.sh & - exec dockerize \ + dockerize \ -wait file://$KCCONF_SERVER_SERVER_SSL_CA_FILE \ -wait file://$KCCONF_SERVER_SERVER_SSL_KEY_FILE \ -wait tcp://db:3306 \ - -timeout 360s \ - /usr/sbin/kopano-server -F + -timeout 360s + # cleaning up env variables + unset "${!KCCONF_@}" + exec /usr/sbin/kopano-server -F ;; dagent) - exec dockerize \ + dockerize \ -wait file://var/run/kopano/server.sock \ - -timeout 360s \ - /usr/sbin/kopano-dagent -l + -timeout 360s + # cleaning up env variables + unset "${!KCCONF_@}" + exec /usr/sbin/kopano-dagent -l ;; gateway) - exec dockerize \ + dockerize \ -wait tcp://kserver:236 \ - -timeout 360s \ - /usr/sbin/kopano-gateway -F + -timeout 360s + # cleaning up env variables + unset "${!KCCONF_@}" + exec /usr/sbin/kopano-gateway -F ;; ical) - exec dockerize \ + dockerize \ -wait tcp://kserver:236 \ - -timeout 360s \ - /usr/sbin/kopano-ical -F + -timeout 360s + # cleaning up env variables + unset "${!KCCONF_@}" + exec /usr/sbin/kopano-ical -F ;; monitor) - exec dockerize \ + dockerize \ -wait file://var/run/kopano/server.sock \ - -timeout 360s \ - /usr/sbin/kopano-monitor -F + -timeout 360s + # cleaning up env variables + unset "${!KCCONF_@}" + exec /usr/sbin/kopano-monitor -F ;; search) - exec dockerize \ + dockerize \ -wait file://var/run/kopano/server.sock \ - -timeout 360s \ - /usr/bin/python /usr/sbin/kopano-search -F + -timeout 360s + # cleaning up env variables + unset "${!KCCONF_@}" + exec /usr/bin/python /usr/sbin/kopano-search -F ;; spooler) - exec dockerize \ + dockerize \ -wait file://var/run/kopano/server.sock \ -wait tcp://mail:25 \ - -timeout 1080s \ - /usr/sbin/kopano-spooler -F + -timeout 1080s + # cleaning up env variables + unset "${!KCCONF_@}" + exec /usr/sbin/kopano-spooler -F ;; *) echo "Failed to start: Unknown service name: '$SERVICE_TO_START'" | ts diff --git a/webapp/start.sh b/webapp/start.sh index ba3c2f9..daf3b4d 100755 --- a/webapp/start.sh +++ b/webapp/start.sh @@ -38,4 +38,6 @@ echo "Starting Apache" rm -f /run/apache2/apache2.pid set +u source /etc/apache2/envvars +# cleaning up env variables +unset "${!KCCONF_@}" exec /usr/sbin/apache2 -DFOREGROUND diff --git a/zpush/start.sh b/zpush/start.sh index 23e4746..5644293 100755 --- a/zpush/start.sh +++ b/zpush/start.sh @@ -43,4 +43,6 @@ echo "Starting Apache" rm -f /run/apache2/apache2.pid set +u source /etc/apache2/envvars +# cleaning up env variables +unset "${!KCCONF_@}" exec /usr/sbin/apache2 -DFOREGROUND