Merge branch 'cguentherTUChemnitz-master'

README.md

@@ -1,4 +1,5 @@
 # (unofficial) Kopano Docker Images
+[![Build Status](https://travis-ci.com/zokradonh/kopano-docker.svg?branch=master)](https://travis-ci.com/zokradonh/kopano-docker)
 
 This repository contains an easy to replicate recipe to spin up a [Kopano](https://kopano.com/) demo environment, which can (through modification of `.env` and possibly `docker-compose.yml`) also be used for production environments.
 
@@ -12,6 +13,8 @@ This repository contains an easy to replicate recipe to spin up a [Kopano](https
 - now run `docker-compose up` and you will see how the remaining Docker images are pulled and then everything is started
 - after startup has succeeded you can access the Kopano WebApp by going to `https://kopano.demo/webapp`
 - you can also access phpLDAPadmin by going to `https://kopano.demo/ldap-admin`
+  - you can access the ldap-admin web frontent in readonly mode with: `LDAP_BIND_DN` env var as login dn and the `LDAP_BIND_PW` env var provided by the .env file (which is generated by the setup.sh)
+  - if you want to modify the ldap content you can access the ldap-admin web frontend by using the `cn=admin,` appending the `LDAP_BASE_DN` env var as the login dn and `LDAP_ADMIN_PASSWORD` as the password
 
 **Note:** There have been reports about the ldap demo not starting up on MacOS. It is recommended to use a Linux OS if you want to use the bundled LDAP image. 
 

docker-compose.yml-example

@@ -1,4 +1,4 @@
-version: "3"
+version: "3.5"
 
 services:
   web:
@@ -19,7 +19,7 @@ services:
     volumes:
       - web:/.kweb
     networks:
-      - web
+      - web-net
 
   ldap:
     image: ${docker_repo:?err}/kopano_ldap_demo
@@ -38,7 +38,7 @@ services:
       - ldap:/var/lib/ldap
       - slapd:/etc/ldap/slapd.d
     networks:
-      - kopanonet
+      - ldap-net
 
   ldap-admin:
     image: osixia/phpldapadmin:0.7.2
@@ -52,7 +52,8 @@ services:
     links:
       - ldap
     networks:
-      - web
+      - ldap-net
+      - web-net
 
   mail:
     image: tvial/docker-mailserver:release-v6.1.0
@@ -102,7 +103,8 @@ services:
       - POSTFIX_DAGENT=lmtp:kopano_dagent:2003
       - REPORT_RECIPIENT=1
     networks:
-      - kopanonet
+      - kopano-net
+      - ldap-net
     #dns: 1.1.1.1 # using Google DNS can lead to lookup errors uncomment this option and 
     # set to the ip of a trusted dns service (Cloudflare is given as an example). 
     # See https://github.com/zokradonh/kopano-docker/issues/52 for more information.
@@ -127,7 +129,7 @@ services:
       timeout: 10s
       retries: 4
     networks:
-      - kopanonet
+      - kopano-net
   
   kopano_ssl:
     image: ${docker_repo:?err}/kopano_ssl
@@ -171,7 +173,8 @@ services:
       - KCCOMMENT_LDAP_1=${KCCOMMENT_LDAP_1}
       - ADDITIONAL_KOPANO_PACKAGES=${ADDITIONAL_KOPANO_PACKAGES}
     networks:
-      - kopanonet
+      - kopano-net
+      - ldap-net
     volumes:
       - kopanodata/:/kopano/data
       - kopanossl/:/kopano/ssl
@@ -190,8 +193,8 @@ services:
       - TZ=${TZ}
       - ADDITIONAL_KOPANO_WEBAPP_PLUGINS=${ADDITIONAL_KOPANO_WEBAPP_PLUGINS}
     networks:
-      - web
+      - web-net
-      - kopanonet
+      - kopano-net
 
   kopano_zpush:
     image: ${docker_repo:?err}/kopano_zpush:${ZPUSH_VERSION}
@@ -206,8 +209,8 @@ services:
     environment:
       - TZ=${TZ}
     networks:
-      - web
+      - web-net
-      - kopanonet
+      - kopano-net
 
   kopano_dagent:
     image: ${docker_repo:?err}/kopano_core:${CORE_VERSION}
@@ -223,7 +226,7 @@ services:
       - KCCONF_DAGENT_LOG_LEVEL=6
       - KCCONF_DAGENT_SSLKEY_FILE=/kopano/ssl/kdagent.pem
     networks:
-      - kopanonet
+      - kopano-net
 
   kopano_spooler:
     image: ${docker_repo:?err}/kopano_core:${CORE_VERSION}
@@ -242,7 +245,7 @@ services:
       - KCCONF_SPOOLER_SMTP_SERVER=mail
       - KCCONF_SPOOLER_SSLKEY_FILE=/kopano/ssl/kspooler.pem
     networks:
-      - kopanonet
+      - kopano-net
 
   kopano_gateway:
     image: ${docker_repo:?err}/kopano_core:${CORE_VERSION}
@@ -258,7 +261,7 @@ services:
       - KCCONF_GATEWAY_SERVER_SOCKET=http://kopano_server:236/
       - KCCONF_GATEWAY_LOG_LEVEL=6
     networks:
-      - kopanonet
+      - kopano-net
 
   kopano_ical:
     image: ${docker_repo:?err}/kopano_core:${CORE_VERSION}
@@ -273,7 +276,7 @@ services:
       - TZ=${TZ}
       - KCCONF_ICAL_SERVER_SOCKET=http://kopano_server:236/
     networks:
-      - kopanonet
+      - kopano-net
 
   kopano_monitor:
     image: ${docker_repo:?err}/kopano_core:${CORE_VERSION}
@@ -287,7 +290,7 @@ services:
       - SERVICE_TO_START=monitor
       - TZ=${TZ}
     networks:
-      - kopanonet
+      - kopano-net
 
   kopano_search:
     image: ${docker_repo:?err}/kopano_core:${CORE_VERSION}
@@ -302,7 +305,7 @@ services:
       - SERVICE_TO_START=search
       - TZ=${TZ}
     networks:
-      - kopanonet
+      - kopano-net
 volumes:
   web:
   ldap:
@@ -317,6 +320,9 @@ volumes:
   zpushstates:
 
 networks:
-  web:
+  web-net:
-  kopanonet:
+  kopano-net:
+    driver: bridge
+  ldap-net:
+    name: ldap-net
     driver: bridge