1
0
mirror of https://github.com/zokradonh/kopano-docker.git synced 2026-08-21 05:13:22 +00:00

rework current front facing proxy (#40)

* replace previous caddy construct with kopano kweb
* add kweb to makefile
* greatly simplifies setup, if user wants to tweak config of kweb he could do so in git and make a local build. Fixes #22 
* ping kweb version
* update readme
* remove build argument from docker-compose for web and ldap-demo
* fix certificate handling in kweb. fixes #38
This commit is contained in:
Felix Bartels
2018-12-01 04:36:11 +01:00
committed by GitHub
parent 6c5af47de1
commit 7948612803
11 changed files with 88 additions and 40 deletions
+10 -19
View File
@@ -2,27 +2,28 @@ version: "3"
services:
web:
build: caddy/
#image: abiosoft/caddy:0.10.4
image: ${docker_repo:?err}/kopano_web
container_name: web
restart: always
privileged: true
links:
- kopano_webapp
- kopano_zpush
ports:
- "2015:2015"
- "${HTTP}:80"
- "${HTTPS}:443"
- "${HTTP}:8080"
- "${HTTPS}:8443"
environment:
- EMAIL=${EMAIL}
- FQDN=${FQDN}
command: wrapper.sh
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- web:/root/.caddy
- web:/.kweb
networks:
- web
ldap:
build: ldap-demo/
#image: osixia/openldap:1.2.2
#build: ldap-demo/
image: ${docker_repo:?err}/kopano_ldap_demo
container_name: ldap
ports:
- 389:389
@@ -48,10 +49,6 @@ services:
environment:
- PHPLDAPADMIN_LDAP_HOSTS=ldap
- PHPLDAPADMIN_HTTPS=false
- CADDY_HOST=${LDAP_HOST}
- CADDY_PORT=80
- CADDY_PROXY_PARAMS=transparent
- CADDY_TLS_SELFSIGNED
command: -l debug
links:
- ldap
@@ -189,9 +186,6 @@ services:
- kopanosocket/:/run/kopano
environment:
- TZ=${TZ}
- CADDY_HOST=${WEBAPP_HOST}
- CADDY_PROXY_PARAMS=transparent
- CADDY_TLS_SELFSIGNED
networks:
- web
- kopanonet
@@ -208,9 +202,6 @@ services:
- zpushstates/:/var/lib/z-push/
environment:
- TZ=${TZ}
- CADDY_HOST=${ZPUSH_HOST}
- CADDY_PROXY_PARAMS=transparent
- CADDY_TLS_SELFSIGNED
networks:
- web
- kopanonet