From 037900a9a69e45d8f3161b10e761504a6ac7be5d Mon Sep 17 00:00:00 2001 From: zokradonh Date: Wed, 2 Jan 2019 09:51:12 +0100 Subject: [PATCH 1/6] Added travis build badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 7f01e2b..8cc8c83 100644 --- a/README.md +++ b/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. From 0be4ae2d257bc3d72bc29f0f8715ab747f97a85c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20G=C3=BCnther?= Date: Wed, 2 Jan 2019 19:57:44 +0100 Subject: [PATCH 2/6] fix ldap admin does not reach the ldap service --- docker-compose.yml-example | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker-compose.yml-example b/docker-compose.yml-example index 5344694..15be42f 100644 --- a/docker-compose.yml-example +++ b/docker-compose.yml-example @@ -38,6 +38,7 @@ services: - ldap:/var/lib/ldap - slapd:/etc/ldap/slapd.d networks: + - ldap-net - kopanonet ldap-admin: @@ -52,6 +53,7 @@ services: links: - ldap networks: + - ldap-net - web mail: @@ -320,3 +322,5 @@ networks: web: kopanonet: driver: bridge + ldap-net: + driver: bridge From 29f72f0f69022a949f5561abf4dd99ec4186ff8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20G=C3=BCnther?= Date: Wed, 2 Jan 2019 19:58:43 +0100 Subject: [PATCH 3/6] use statically named ldap-net to be able to connect external services more easily --- docker-compose.yml-example | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml-example b/docker-compose.yml-example index 15be42f..bc74463 100644 --- a/docker-compose.yml-example +++ b/docker-compose.yml-example @@ -1,4 +1,4 @@ -version: "3" +version: "3.5" services: web: @@ -323,4 +323,5 @@ networks: kopanonet: driver: bridge ldap-net: + name: ldap-net driver: bridge From 0d8bf9b46dc45400b2d3c8b0a8339fcd63410ff5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20G=C3=BCnther?= Date: Wed, 2 Jan 2019 20:00:11 +0100 Subject: [PATCH 4/6] split kopano networking into kopanonet and ldap-net --- docker-compose.yml-example | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml-example b/docker-compose.yml-example index bc74463..d57e39b 100644 --- a/docker-compose.yml-example +++ b/docker-compose.yml-example @@ -39,7 +39,6 @@ services: - slapd:/etc/ldap/slapd.d networks: - ldap-net - - kopanonet ldap-admin: image: osixia/phpldapadmin:0.7.2 @@ -105,6 +104,7 @@ services: - REPORT_RECIPIENT=1 networks: - kopanonet + - 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. @@ -174,6 +174,7 @@ services: - ADDITIONAL_KOPANO_PACKAGES=${ADDITIONAL_KOPANO_PACKAGES} networks: - kopanonet + - ldap-net volumes: - kopanodata/:/kopano/data - kopanossl/:/kopano/ssl From 5b679b08b6a4a7682dc8114498634a47cdfbf77f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20G=C3=BCnther?= Date: Wed, 2 Jan 2019 20:17:52 +0100 Subject: [PATCH 5/6] add readme hint to access ldap admin --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 8cc8c83..09f0460 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,7 @@ 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 with: `dc=admin,dn=kopano,dn=demo` as login dn and the `LDAP_ADMIN_PASSWORD` environment variable provided by the .env file (which is generated by the setup.sh) **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. From c678bf45d6db3ee5290ab0c86de95d208a074c34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20G=C3=BCnther?= Date: Wed, 2 Jan 2019 21:08:06 +0100 Subject: [PATCH 6/6] rename networks for consistency readme fixup --- README.md | 3 ++- docker-compose.yml-example | 34 +++++++++++++++++----------------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 09f0460..ff4c7ca 100644 --- a/README.md +++ b/README.md @@ -13,7 +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 with: `dc=admin,dn=kopano,dn=demo` as login dn and the `LDAP_ADMIN_PASSWORD` environment variable provided by the .env file (which is generated by the setup.sh) + - 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. diff --git a/docker-compose.yml-example b/docker-compose.yml-example index d57e39b..5312744 100644 --- a/docker-compose.yml-example +++ b/docker-compose.yml-example @@ -19,7 +19,7 @@ services: volumes: - web:/.kweb networks: - - web + - web-net ldap: image: ${docker_repo:?err}/kopano_ldap_demo @@ -53,7 +53,7 @@ services: - ldap networks: - ldap-net - - web + - web-net mail: image: tvial/docker-mailserver:release-v6.1.0 @@ -103,7 +103,7 @@ 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). @@ -129,7 +129,7 @@ services: timeout: 10s retries: 4 networks: - - kopanonet + - kopano-net kopano_ssl: image: ${docker_repo:?err}/kopano_ssl @@ -173,7 +173,7 @@ services: - KCCOMMENT_LDAP_1=${KCCOMMENT_LDAP_1} - ADDITIONAL_KOPANO_PACKAGES=${ADDITIONAL_KOPANO_PACKAGES} networks: - - kopanonet + - kopano-net - ldap-net volumes: - kopanodata/:/kopano/data @@ -193,8 +193,8 @@ services: - TZ=${TZ} - ADDITIONAL_KOPANO_WEBAPP_PLUGINS=${ADDITIONAL_KOPANO_WEBAPP_PLUGINS} networks: - - web - - kopanonet + - web-net + - kopano-net kopano_zpush: image: ${docker_repo:?err}/kopano_zpush:${ZPUSH_VERSION} @@ -209,8 +209,8 @@ services: environment: - TZ=${TZ} networks: - - web - - kopanonet + - web-net + - kopano-net kopano_dagent: image: ${docker_repo:?err}/kopano_core:${CORE_VERSION} @@ -226,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} @@ -245,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} @@ -261,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} @@ -276,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} @@ -290,7 +290,7 @@ services: - SERVICE_TO_START=monitor - TZ=${TZ} networks: - - kopanonet + - kopano-net kopano_search: image: ${docker_repo:?err}/kopano_core:${CORE_VERSION} @@ -305,7 +305,7 @@ services: - SERVICE_TO_START=search - TZ=${TZ} networks: - - kopanonet + - kopano-net volumes: web: ldap: @@ -320,8 +320,8 @@ volumes: zpushstates: networks: - web: - kopanonet: + web-net: + kopano-net: driver: bridge ldap-net: name: ldap-net