- [demo](demo) Use host timezone by mounting /etc/localtime.

- [demo](demo) Since 10.0.1 LDAP users don't get their share created, so `make init` now does that.

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.1.5
+
+- [demo](demo) Use host timezone by mounting /etc/localtime.
+- [demo](demo) Since 10.0.1 LDAP users don't get their share created, so `make init` now does that.
+
 # 1.1.4
 
 - Use `LDAP_URI` now that the historic directives `LDAP_HOST`, `LDAP_PORT`, `LDAP_PROTOCOL` are no longer supported (8.7.85).

Dockerfile

@@ -38,7 +38,7 @@ RUN	apt-get update && apt-get install --yes --no-install-recommends \
 	ca-certificates \
 	tar \
 	gnupg \
-	&& setup-runit.sh "syslogd -n -O - -l $SYSLOG_LEVEL $SYSLOG_OPTIONS"
+	&& setup-runit.sh "syslogd -nO- -l$SYSLOG_LEVEL $SYSLOG_OPTIONS"
 
 
 

demo/Makefile

@@ -12,7 +12,7 @@ variables:
 ps:
 	docker-compose ps
 
-init: auth-up wait_1 auth-mod_index auth-add_user mail-db-up mail-mta-up wait_2 mail-app-up
+init: auth-up wait_11 auth-mod_index auth-add_user mail-db-up mail-mta-up wait_12 mail-app-up wait_23 mail-app-create_store
 
 up:
 	docker-compose up -d
@@ -27,7 +27,7 @@ config:
 	docker-compose config
 
 wait_%:
-	sleep 10
+	sleep $*
 
 web:
 	firefox localhost:8080 &
@@ -152,3 +152,6 @@ mail-app-show_user1:
 
 mail-app-show_user2: mail-app-debugtools
 	docker-compose exec mail-app ldapsearch -H ldap://auth:389 -xLLL -b $(LDAP_BASE) '*'
+
+mail-app-create_store:
+	docker-compose exec mail-app kopano-admin --create-store $(LDAP_TEST_USER)

demo/docker-compose.yml

@@ -27,6 +27,7 @@ services:
       - mail-conf:/etc/kopano
       - mail-atch:/var/lib/kopano/attachments
       - mail-sync:/var/lib/z-push
+      - /etc/localtime:/etc/localtime:ro    # Use host timezone
     cap_add: # helps debugging by alowing strace
       - sys_ptrace
 
@@ -56,6 +57,7 @@ services:
       - RAZOR_REGISTRATION=${RAZOR_REGISTRATION-}
     volumes:
       - mail-mta:/srv
+      - /etc/localtime:/etc/localtime:ro    # Use host timezone
     cap_add: # helps debugging by alowing strace
       - sys_ptrace
 
@@ -72,6 +74,7 @@ services:
       - MYSQL_PASSWORD=${MYSQL_PASSWORD-secret}
     volumes:
       - mail-db:/var/lib/mysql
+      - /etc/localtime:/etc/localtime:ro    # Use host timezone
 
   auth:
     image: mlan/openldap
@@ -81,6 +84,7 @@ services:
       - LDAP_LOGLEVEL=parse
     volumes:
       - auth-db:/srv
+      - /etc/localtime:/etc/localtime:ro    # Use host timezone
 
 networks:
   backend:

src/docker/entrypoint.d/50_update-loglevel

@@ -13,5 +13,5 @@ inform() { printf "entrypoint[$$]: INFO:$(basename $0): $*.\n" ;}
 
 if [ -n "$SYSLOG_LEVEL" ]; then
 	inform "Setting syslogd level=$SYSLOG_LEVEL"
-	setup-runit.sh "syslogd -n -O - -l $SYSLOG_LEVEL $SYSLOG_OPTIONS"
+	setup-runit.sh "syslogd -nO- -l$SYSLOG_LEVEL $SYSLOG_OPTIONS"
 fi