1
0
mirror of https://github.com/zokradonh/kopano-docker synced 2025-06-07 07:56:12 +00:00

536 Commits

Author SHA1 Message Date
Felix Bartels
9bba2ec77e
Make it possible to override the final exe (#392)
* move all env definition in same block
* implement EXE env variable for kopano-core
  * Obsoletes parts of https://github.com/zokradonh/kopano-docker/pull/366
* use EXE in konnect container
* add exe for web
* make it possible to docker-composer run commands in web container
2020-05-05 21:03:47 +02:00
Felix Bartels
05230d1c0a
add Vagrantfile for easy local test/dev deployment (#394)
* add Vagrantfile for easy local test/dev deployment
* add exception to editorconfig
* Update README.md
* update ci tools
* add jq to setup ci script
2020-05-05 20:08:23 +02:00
Felix Bartels
87de275e9f
add example how to build dedicated container for services such as dagent (#391)
* add example how to build dedicated container for services such as dagent

Obsoletes part of https://github.com/zokradonh/kopano-docker/pull/366

Signed-off-by: Felix Bartels <felix@host-consultants.de>

* add new dockerfile for dagent

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2020-05-01 15:53:57 +02:00
Felix Bartels
7b05f10206
add a switch to allow usage of specific ssl cert (#389)
* add a switch to allow usage of specific ssl cert
* add documentation how to specify own certificates and what to do when running web behind an existing proxy
2020-05-01 14:32:37 +02:00
Felix Bartels
734d3c61db
Check if external authority is correctly configured (#390)
* check if oidc provider is reachable

Relates to https://github.com/zokradonh/kopano-docker/issues/376

Signed-off-by: Felix Bartels <felix@host-consultants.de>

* compare issuer in the discovery document with the configured one

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2020-05-01 12:23:06 +02:00
Felix Bartels
3572fc74e7
Add parsing of signed_out_uri to konnect (#388)
Allow external configuration of --signed-out-uri in konnect

Signed-off-by: Felix Bartels <felix@host-consultants.de>

Co-authored-by: Erik Damrose <damrose@univention.de>
2020-04-30 13:59:06 +02:00
Felix Bartels
08385e8f79 Repair version label of web container 2020-04-30 13:57:53 +02:00
Felix Bartels
110ea43bf6
Rework label handling (#387)
* be smarter about labels

inspired by https://github.com/Peter-SAARLAND/zero
2020-04-28 22:16:12 +02:00
Felix Bartels
a0c14b6ad4
add config registry settings for single logout (#385)
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2020-04-22 12:50:59 +02:00
Felix Bartels
12f7f82648
Update to latest Konnect release (#383)
* newest konnect

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2020-04-16 13:01:20 +02:00
Felix Bartels
e33a3cc03e
Add example to use meet with ads (#382)
data provided by @ronnybremer

Fixes: https://github.com/zokradonh/kopano-docker/issues/373

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2020-04-16 13:00:59 +02:00
Felix Bartels
d188aff633
add apache example (#381)
fixes https://github.com/zokradonh/kopano-docker/issues/372

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2020-04-16 13:00:46 +02:00
Felix Bartels
f2ad4c5ea7
Fix builds (#384)
A recent change in Alpine broke the use of shellcheck for me and the general recommendation of the Alpine team is to not mix a release with their edge repo. Therefore this fix now copies shellcheck over from their own build instead of installing it from the Alpine repos.

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2020-04-16 12:24:24 +02:00
Felix Bartels
13dad903c9
Update Konnect to 0.31.0 (#380) 2020-04-10 16:03:09 +02:00
Felix Bartels
9efed4fe80
move implicit defaults to docker-compose (#353)
Reson: some non-default configuration options are backed into the startup scripts. This can be unexpected when mounting files e.g. in a Kubernetes setup.

https://github.com/zokradonh/kopano-docker/issues/294

* core configuration
* fix compose for meet
* remove interpreter from start script
* use default oidc timeout
2020-04-09 09:39:30 +02:00
Felix Bartels
cfbc22d947
Add the ability to specify the client_id for external oidc providers 2020-04-08 08:35:44 +02:00
Felix Bartels
aa8d884a67 fix formatting
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2020-04-06 09:14:33 +02:00
Felix Bartels
2eb025b86f
more cases for updating the identifier registration (#378)
* update working copy on each step
2020-04-03 11:12:01 +02:00
Felix Bartels
bf8a545e3e
Merge pull request #377 from fbartels/konnect-domain-change
rework "guest already configured check"
2020-04-01 11:54:36 +02:00
Felix Bartels
51c6bb8fca rework "guest already configured check"
Instead of grepping for the guest key it now greps for the fqdn
make output yaml again

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2020-04-01 08:02:34 +02:00
Felix Bartels
0e0601723b
Merge pull request #375 from fbartels/kweb-caps
drop caps in meet example as well
2020-03-28 18:45:27 +01:00
Felix Bartels
1fe23b36ac drop caps in meet example as well
Fixes: https://github.com/Kopano-dev/kopano-docker/issues/12
Relates to: https://github.com/zokradonh/kopano-docker/issues/322

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2020-03-28 16:44:08 +01:00
Felix Bartels
c42bb2458f
Mount /var/lib/dbus/machine-id from /etc/machine-id (#374)
Fixes https://github.com/zokradonh/kopano-docker/issues/371
2020-03-27 15:18:46 +01:00
Felix Bartels
97ebd264d6 Mount /var/lib/dbus/machine-id from /etc/machine-id
Fixes https://github.com/zokradonh/kopano-docker/issues/371

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2020-03-27 14:54:51 +01:00
Felix Bartels
864459d745
Make it possible to specify a turn service secret as a text env (#370)
* update kwmserver to 1.1.1
* add scripting to create turn_server_shared_secret as a file
* make startup of kwmserver verbose when DEBUG env is set
2020-03-25 14:39:11 +01:00
Felix Bartels
c9701494f1
Make registration_conf configurable through an env (#369)
* Make registration_conf configurable through an env

Fixes https://github.com/zokradonh/kopano-docker/issues/368

Signed-off-by: Felix Bartels <felix@host-consultants.de>

* add registration_conf to meet example

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2020-03-23 16:42:11 +01:00
theoneandonly-vector
5281fb1f03
Allow users to use different saslauthd-options. (#361)
* Update docker-compose.mail.yml
* default to rimap for saslauth
Co-authored-by: Felix Bartels <felix@host-consultants.de>
2020-03-23 15:18:24 +01:00
Felix Bartels
3f4a56a562
fix external authority support (#367)
* comment currently broken tests (because of read-only container)
* move initial creation out of guest or authority configuration
* instead of copying merge files into destination with slurp
* failsafe authority registration
2020-03-19 15:41:23 +00:00
Felix Bartels
c8a7958083
example to build local container with just some added plugins (#350)
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2020-03-16 15:11:21 -04:00
Felix Bartels
4e9829f466
Improve Konnect wrapper script (#359)
* only enter guest mode config if the value is not in the identifier registration already
2020-03-16 15:09:24 -04:00
Felix Bartels
646f5151f5
Make build fail early if bad version string is received (#365)
* add basic version number check
2020-03-15 14:24:37 -04:00
Felix Bartels
ae71b326a7
update to kweb 0.9.1 (#364)
* update to kweb 0.9.1

Signed-off-by: Felix Bartels <felix@host-consultants.de>

* remove workaround for store creation

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2020-03-13 16:03:05 +01:00
Felix Bartels
3d81632698 also remove wait for socket for secure connections
references https://github.com/zokradonh/kopano-docker/pull/346

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2020-03-10 16:38:48 +01:00
Felix Bartels
6cc5d12343
fix php version in kweb config (#357)
* fix php version in kweb config
* include webapp kweb config only in the webapp container build
* add workaround for https://jira.kopano.io/browse/KW-3398 for oidc
2020-03-10 15:30:03 +01:00
Felix Bartels
da5d41c411
update konnect to latest (#356)
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2020-03-09 20:41:29 +01:00
Felix Bartels
a0c53e15a9
Install optional grapi dependencies (#347)
* install optional dependencies for grapi
* add hadolint exception
2020-03-06 12:47:31 +01:00
Felix Bartels
5ed1d05fe7
transform LDAP_SERVER to LDAP_HOST (#355)
SASL only wants the host, not the uri

Fixes https://github.com/zokradonh/kopano-docker/issues/354

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2020-03-06 09:59:31 +01:00
Felix Bartels
43928e538c
Specify config location through KOPANO_CONFIG_PATH env variable (#352)
* Specify config location through KOPANO_CONFIG_PATH env variable
* add commander test to verify config is honoured by cli programs
* remove wrappers other than kopano-cli as it cannot make use of KOPANO_CONFIG_PATH

Fixes: https://github.com/zokradonh/kopano-docker/issues/351
2020-03-05 14:35:05 +01:00
Felix Bartels
5d4fabf280
update ldap container to latest version (#341)
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2020-02-27 15:30:10 +01:00
Felix Bartels
bec6b33365
add php-mbstring directly as this dependency is missing in z-push for Buster (#345)
sort packages to install

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2020-02-27 15:23:55 +01:00
Felix Bartels
7eeea1944c
repair health check for kopano-webapp and kopano-meet (#344)
* json output in the healtcheck is hard to read

Signed-off-by: Felix Bartels <felix@host-consultants.de>

* fix meet health check after moving json to /tmp

Signed-off-by: Felix Bartels <felix@host-consultants.de>

* fix webapp health check

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2020-02-27 15:23:13 +01:00
Felix Bartels
40981f460b
No longer test for grapi socket, but kapi endpoint instead (#346)
* we can no longer test for the existance of notify.sock since version 10.1.0 introduces multiple sockets

Signed-off-by: Felix Bartels <felix@host-consultants.de>

* switch startup tests to tcp tests for kapi endpoint

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2020-02-27 15:00:43 +01:00
Felix Bartels
6521970f23 add note to compose file
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2020-02-25 13:35:26 +01:00
Felix Bartels
0561a979bc
update to Debian Buster (#253)
* update to Debian Buster
* update webapp container
* update kdav image to buster
  * add some debug commands
* use onbuild to specify building of core repository only in one place
* remove ca-certificates and git from kdav image
  * git should not be needed since kdav has a builder stage
  * ca-certificates is already installed in an earlier stage
* upgrade to Debian 10 for Z-Push
* switch remaining Debian 9 repos in webapp
* use a new major version for the base image
  * since its now based on buster
* add new parameters to the onbuild step
* update repos in setup.sh
* switch default distribution in create repo script
2020-02-25 13:31:54 +01:00
Felix Bartels
24f82964d4
pass --no-cache-dir to pip install (#340)
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2020-02-22 10:21:51 +01:00
Felix Bartels
62837d0809
update konnect (#339)
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2020-02-14 12:20:57 +01:00
Felix Bartels
78bd1a275b
update kwmserver (#338)
* update kwmserver
2020-02-14 09:06:22 +01:00
Felix Bartels
093c7c5daf
Update CONTRIBUTING.md 2020-02-12 12:38:01 +01:00
Felix Bartels
5f10e982a6
relax machine-id check for now (#336)
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2020-02-07 16:03:05 +01:00
Felix Bartels
736943c860 fix pushing containers
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2020-02-07 11:29:27 +01:00