1
0
mirror of https://github.com/zokradonh/kopano-docker synced 2025-06-28 10:16:39 +00:00

44 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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 a7c2134347/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
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
f6fc395066 fix kdav publish 2019-03-05 21:01:40 +01:00
Felix Bartels
1efead4e9c do not tag kdav for the moment 2019-03-05 20:47:55 +01:00
Felix Bartels
842385ee34
add Kdav (#83)
* add a kdav image
* do not install composer into the docker image
instead use a multi stage build that copies the resulting directory into the final image
* set default version in compose

resolves #54
2019-03-05 17:03:22 +01:00
Felix Bartels
8cdd0c63f9
Unignore compose (#94)
* merge docker-compose.yml-example with docker-compose.yml
2019-02-27 12:22:03 +01:00
Felix Bartels
e3d7e01583
Add Kopano Meet and depending instrastructure to meet
Makefile adjustments
reorder Makefile
adds image for kwmserver
adds image for meet
add Meet to compose
clean up proxy configuration
move kcconf.py into the base image
2019-02-19 12:57:57 +01:00
Felix Bartels
7451d13f83 make build-simple also phony
add default target

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-02-09 13:04:38 +01:00
Felix Bartels
db7d042599 add build-simple
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-02-09 13:04:38 +01:00
Felix Bartels
6c70d11108 acutally publish konnect
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-01-27 21:00:47 +01:00
Felix Bartels
eafcbc982b get list of docker tags (when jq is available)
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-01-27 20:51:38 +01:00
Felix Bartels
a630007059
add version tagging to the web and konnect image (#78) 2019-01-11 08:06:21 +01:00
Felix Bartels
ceccd836de we should also publish konnect
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-01-10 18:44:39 +01:00
Felix Bartels
bba8686488 add playground to the containers to be published
fixes https://github.com/zokradonh/kopano-docker/issues/77

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-01-10 18:42:21 +01:00
Felix Bartels
246638297e make build phony
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-01-10 11:41:21 +01:00
Felix Bartels
789762cb34
WIP: Kopano Konnect und Rest API (#72)
* add a new image for konnect
* add konnect to compose file
* adapt gencerts for konnect certs
* integrate gencerts into start.sh and adapt if to only skip individual parts
* add container for kapi
* use same config for webapp and z-push as https://stash.kopano.io/projects/KGOL/repos/kweb/browse/config/legacy.go
* use example compose file in make test target
* make compose file configurable through an env variable
* remove legacy links in compose
* write certificates first to a tempfile
* remove unnecessary paths
* add option to run kapi insecure for testing
* configure openid for kopano-server
* add local playground to test functionality of konnect and kapi
* print errors and logs to stdout in web
* add extrahosts to kopano_server
* adapt extrahosts for ip command on ubuntu 18.04
* add documentation

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-01-09 21:57:04 +01:00
Felix Bartels
cfd3ce09b6 remove pushing of git tags
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2018-12-30 18:05:07 +01:00
Felix Bartels
c38da0ee3e move docker_repo into the ifndef as well
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2018-12-30 18:05:07 +01:00
Felix Bartels
3c822ad08f try to fix password sourcing for travis
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2018-12-30 18:05:07 +01:00
Felix Bartels
a0e045ff38 implement building and tagging through jenkins
* improve runtime by moving some variable assignments into the individual tag targets
* add expect script to run setup.sh in travis
* change language in travis
* add secrets for kopano docker account
2018-12-30 18:05:07 +01:00
Felix Bartels
e5785428c3 add specific tasks to travis for master branch
repair nightly webapp builds

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2018-12-22 17:53:24 +01:00
Felix Bartels
4771dc823c fix build with supported webapp
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2018-12-22 17:10:20 +01:00
Felix Bartels
91c8562d1a fix version tagging
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2018-12-22 16:14:04 +01:00
Felix Bartels
bdef62508e adapt makefile for utils image
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2018-12-22 16:14:04 +01:00
Felix Bartels
51f11fb749 add dedicated docker container for some utils
fixes https://github.com/zokradonh/kopano-docker/issues/57

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2018-12-22 16:14:04 +01:00
Felix Bartels
485298bb76 add quick-test to makefile
fix socker for ical and gateway
enable non-ssl gateway and remove ssl options from docker-compose
ssl for gateway could be implemented as part of https://github.com/zokradonh/kopano-docker/issues/16

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2018-12-18 11:09:07 +01:00
Felix Bartels
78d4c60f6e add additional webapp plugins to makefile
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2018-12-14 22:52:29 +01:00
Felix Bartels
8bc2ae557b remove attributes already indexed from optimize-index.ldif
add some more images to build-all make target
let compose start in the background with make test

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2018-12-12 12:53:48 +01:00
Felix Bartels
55a8c7705f docker-compose down -v also removes volumes
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2018-12-03 18:45:29 +01:00
Felix Bartels
66f870a5da adapt make test to clear volumes
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2018-12-03 18:40:53 +01:00
Felix Bartels
7948612803
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
2018-12-01 04:36:11 +01:00
Felix Bartels
861ae56925
Have a dedicate container for z-push (#19)
* remove z-push from webapp image

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

* remove z-push from webapp start script

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

* add container for z-push

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

* adapt version.sh for z-push

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

* ci: committing changes for zpush

* tune version.sh for z-push
adapt makefile

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

* add z-push to setup script and docker-compose

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2018-11-11 15:00:53 +01:00
Felix Bartels
4728072dd5 make docker-compose easier to use (also by introducing variables and a setup script)
update Dockerfiles/Makefile for use with kopano supported build
introduce a local ldap image with some demo users
include caddy for reverse proxying
add proper documentation and remove obsolete build and push scripts

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2018-11-09 19:23:04 +01:00
Felix Bartels
8902cc95c7 pass --build-arg KOPANO_$(COMPONENT)_VERSION to docker build to invalidate caches once a new nightly has been uploaded
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2018-10-18 14:25:49 +02:00
Felix Bartels
6282c45340 remove cleared todos
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2018-10-16 08:32:03 +02:00
Felix Bartels
6985fc2a2c refactor makefile to not duplicate all build and tag commands
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2018-10-16 08:11:19 +02:00
Felix Bartels
3b96eeafc2 remove obsolete todo
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2018-10-15 12:09:52 +02:00
Felix Bartels
a3b39014bf add makefile
add example docker-compose (for easy copy and paste)
refactor common multi stage image to base image for core and webapp
add docker version tagging
add a version to the base image as well

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2018-10-14 23:35:26 +02:00