1
0
mirror of https://github.com/zokradonh/kopano-docker.git synced 2026-08-11 16:32:59 +00:00
Commit Graph

298 Commits

Author SHA1 Message Date
Felix Bartels f5cd9a2044 add the ldap containers to the ones being published (#148)
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-05-02 15:19:06 +02:00
Felix Bartels 13dae1e734 some makefile linting fixes (#145)
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-04-19 12:28:23 +02:00
Felix Bartels 1db616d24c remove smime, files and mdm version
as they are just "newest" when using the repo and are put in the file through dl_and_package_community when not
uniquely sort file to filter out duplicates
remove workaround from makefile

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-04-18 22:18:30 +02:00
Felix Bartels 250c73053f Add additional readme files for all produced images (#141) 2019-04-18 08:20:38 +02:00
Felix Bartels 6b3ded8dfc hotfix tagging of webapp builds (#143)
since the introduction of the php base image version information in the webapp container are doubled. by removing the build args from the php image at least there is no "newest" version any longer for webapp, but it still shows the version twice.

this introduces a hotfix for this behaviour.

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-04-17 11:38:34 +02:00
Felix Bartels 7da6c3db09 update kwmserver to 0.15.3 (#142)
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-04-17 11:27:26 +02:00
Felix Bartels a65e684463 add a common php image to base webapp, z-push and kdav on (#138)
* adapt webapp container for new php base image
* clean out webapp dockerfile
* complete switch of webapp to php-fpm
* update config in web container
* update readme
* remove logging config from docker-compose.yml
* add php container to tagging and publishing
2019-04-14 13:31:19 +02:00
Felix Bartels c5756e30c9 Make less matching less strict again (#140)
* remove setting insecure cookies by default
* less strict matching partially undoes https://github.com/zokradonh/kopano-docker/commit/48e22da9d17ab6ae658be98d0997f226924fcacb
2019-04-14 10:31:49 +02:00
Felix Bartels b75403f69a Smaller optimisations (#137)
* add docker pull to warm up build cache on travis
* explicitly build multi stage build stages
* make create repo script dynamic in the choice of the distribution
2019-04-05 08:48:32 -05:00
Felix Bartels de704dd8ec install some more tools in utils
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-03-31 21:22:41 +02:00
Felix Bartels 48e22da9d1 Rework php cfg handling a bit (#135)
* make sed matching a bit more strict
* append settings if not found instead of throwing error

fixes #133
2019-03-30 19:37:19 +01:00
mithomas 905bdf0edd Change restart to unless-stopped for consistency. (#134) 2019-03-30 06:17:03 +01:00
Felix Bartels fed033e60c Merge branch 'mithomas-master' 2019-03-28 07:57:50 +01:00
Felix Bartels 23b8a68261 also fix env_file name for scheduler
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-03-28 07:57:21 +01:00
Michael Thomas 5e678415ab Prefix scheduler container name with COMPOSE_PROJECT_NAME.
In line with the other names for running multiple instances of this stack on the same host.
2019-03-27 21:44:58 +01:00
Felix Bartels 150a75bbe0 add example override file for minio (#130)
rename mail disable override file

fixes #74

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-03-25 17:00:37 +01:00
Felix Bartels aefcf10485 Make z-push configurable through env (#128)
* change current config changes to use php_cfg_gen
* add remaining (for kopano relevant config files)
* add autodiscover to z-push image
* add more autodiscover aliases to kweb

fixes #114 #39
2019-03-25 10:16:46 +01:00
Felix Bartels 67e8f44eac add example override file for watchtower
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-03-24 19:10:40 +01:00
Felix Bartels 92086807ce add missing publish for scheduler
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-03-24 19:09:24 +01:00
Felix Bartels cc1167291c Make this project work with ID4ME (DenicID) (#127)
* update konnect to 0.21.0
* add example configuration
2019-03-24 18:44:36 +01:00
Felix Bartels caac8a5c03 wip: Implement a scheduler to run recurring tasks (such as z-push-gabsync) (#123)
* add scheduler container for gabsync
Adds a general scheduler container to trigger tasks within containers.
Also adds gabsync to zpush image
* make scheduler dynamic
execute each cron job once at startup to see if they would succeed
* remove services scripts from core container (now is part of the scheduler)
* add "CRONDELAY" for tasks that should not be executed at startup
* add documentation
* clear out crontab at startup
2019-03-24 17:33:41 +01:00
Felix Bartels 830ac3c838 auto create turn credentials file from env (#126)
* auto create turn credentials file from env
2019-03-24 11:36:19 +01:00
Felix Bartels a95a1f9b14 properly fix non ssl startup for meet
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-03-23 19:38:20 +01:00
Felix Bartels b5e6f0fecf add meet port to test
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-03-23 17:48:45 +01:00
Felix Bartels 60ab127065 readd tls=no
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-03-23 17:47:43 +01:00
Felix Bartels b98ecf2342 fix tests
(why did it not fail before?)

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-03-23 16:58:53 +01:00
Felix Bartels f48e1b2084 remove container name from images not depending on it (not being able to scale up) (#125)
fixes #124

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-03-23 09:51:49 +01:00
Felix Bartels 6aff14c021 Check with travis if containers start (#113)
* move .env creation into install
rerun check-scripts after creation as well
* update docker-compose
* add simple test if containers start up
* redirect output of compose stop
2019-03-23 08:36:55 +01:00
mithomas 29839286ad Add dynamic dependency-wait for server and spooler service. (#119)
* Add dynamic dependency-wait for server and spooler service.
Instead of using hard-coded dependency-waits on startup for database and MTA for the server and spooler, respectively, the actually configured values are now used.

For the servers, this also takes the use of a unix file socket over a network socket into account.
2019-03-23 00:10:22 +01:00
Felix Bartels 71f88b8451 fix wrong config option in server default config
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-03-22 19:34:01 +01:00
Felix Bartels dffb90e972 Misc (#120)
* add example docker override (one which would disable the mail container)
* move some config options from docker-compose into the default conf
* add missing depends_on
2019-03-22 19:07:44 +01:00
mithomas 676360dbb4 Prefix container names with COMPOSE_PROJECT_NAME. (#118)
* Prefix container names with COMPOSE_PROJECT_NAME.

This way it is easily possible to use several instances of this service stack on one host via different .env-files (e.g. for staging/production).
Volumes and networks are separated in this manner by docker-compose anyway, now the containers are too.

* Use underscore in container-names for consistency with networks and volumes.

* Remove "kopano" from container names.

This avoids repetition in the names when using the default project name which also "kopano".

* Make Caddy default port configurable.
2019-03-22 14:04:42 +01:00
mithomas aa6043a7bd Remove redundant explicit name for ldap-net. (#117)
Since the custom name for the network ldap-net is identical to the default, this line is redundant.
2019-03-20 22:34:13 +01:00
Felix Bartels 21237f97c3 overriding config
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-03-20 07:50:38 +01:00
Felix Bartels 9a6dbd4a20 handle true/false differently in webapp config (#115)
* true/false should not be put in quotes as its boolean
* add a tab before inserting
2019-03-18 16:57:19 +01:00
Felix Bartels 140506df7d Add support for meet guest mode and make meet configurable through env (#105)
* get settings for meet from env
* prepare ssl container for device registration for konnect/kwmserver
* move device registry modification to konnect container
* enable WebApp in the app switcher
* upstream docker container has been updated to alpine 3.9
* update konnect
* add further config for guest mode
* replace the check for the file with a check for konnect startup
* fix kwmserver wrapper
* add possibility to change logging in kwmserver
2019-03-18 15:22:32 +01:00
Felix Bartels 4e367badc5 make webapp configurable from env (#112)
* make webapp configurable from env
inspired by https://github.com/mlan/docker-kopano/blob/master/assets/entrypoint.sh#L80-L92 and https://github.com/zokradonh/kopano-docker/blob/a7c213434766f5433148ea6b50e0894094b92e12/meet/start-service.sh#L22-L27
  * updating is in a dedicated function and has verbose error handling
* add documentation for env variables
2019-03-18 12:45:03 +01:00
Felix Bartels c8c55ae2aa add todo about webapp sessions
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-03-15 09:49:42 +01:00
Felix Bartels 039189520f update ldap base
add another fix to version.sh

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-03-14 11:29:23 +01:00
Felix Bartels 4303afe1e3 fix last name of Timmothy
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-03-14 09:25:47 +01:00
Felix Bartels 91ccf89765 add linting for shell scripts and Dockerfiles
* add hadolint for dockerfile linting
* add hadofile config
* add checks for dockerfiles and shellcheck into makefile
* shellcheck fixes
* add workaround so that .env can be sourced again from version.sh
* hadolint fixes
* print progress of build/run.sh
* fix check for jq in setup.sh

relates to #41 and #26
2019-03-14 07:46:54 +01:00
Felix Bartels f5a24f2150 Merge pull request #107 from cguentherTUChemnitz/patch-1
switch restart always to unless-stopped
2019-03-11 19:59:57 +01:00
Felix Bartels 9dc6d76eea Merge pull request #109 from mhoffmann75/mhoffmann75-patch-zpush-proxy-header
Make real IP logging work in proxy scenario
2019-03-11 19:28:38 +01:00
Martin Hoffmann 6bd8db655b Make real IP logging work in proxy scenario
USE_CUSTOM_REMOTE_IP_HEADER should either be false or contain the name of the header to be used.
2019-03-11 18:05:07 +01:00
cguentherTUChemnitz 6e19eeba27 switch restart always to unless-stopped
I try to integrate the backup mechanisms of https://github.com/blacklabelops/volumerize, handling named volumes and automatic service stop and restart for consistent backups. Nevertheless this needs a clean stop of a service, which is only able to be achieved, if the docker restarts the containers only if they are not explicitly stopped.
2019-03-11 12:43:45 +01:00
Felix Bartels bd83306390 Merge pull request #106 from mithomas/master
Make remaining mail ports (SMTPS/MSA/IMAP) configurable.
2019-03-11 12:28:22 +01:00
Michael Thomas d378b12a2c Make remaining mail ports (SMTPS/MSA/IMAP) configurable. 2019-03-11 10:39:42 +01:00
Felix Bartels 3868b2af95 also redirect errors when checking for jq
relates to #103

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-03-10 18:47:05 +01:00
Felix Bartels 142ddc40f7 Merge pull request #104 from r00tc0d3/master
Changed 'sed -r' to 'sed -E' in setup.sh for better compatibility
2019-03-10 18:38:45 +01:00
r00tc0d3 3bf57693d7 Changed 'sed -r' to 'sed -E' in setup.sh for better compatibility 2019-03-10 17:28:57 +01:00