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

59 Commits

Author SHA1 Message Date
Felix Bartels f19cf274f7 prepare automatic security scanning (#122)
* add todo for docker wait
* add makefile target to scan containers with trivy
* pin version of trivy in travis file
* add trivy cache to persistent storage of travis (commented since not part of ci for the moment)
* reorg travis file + remove goss as it is not used
* add a fixed version for the base image
* add file with tags to gitignore
* introduce tag-all target
* remove after_failure step
* add ignore file for trivy
* store the tag for the builder as well
* remove tag_file after completing scans
* replace manual build and publish commands with generated ones
* update kdav builder to resolve CVE-2019-3855
* ignore CVE-2019-3855 which is thrown in kdav build container
* exclude the build-webapp-demo from build-all
2019-05-27 13:09:13 +02:00
Felix Bartels d94b7ca55d remove surplus locale definition from images building upon base (#165)
* remove surplus locale configuration (should only be in base image)
update konnect
add version to ldap and ldap_demo images
* also create a tag for the ldap images
* add ldap version to compose file
2019-05-27 12:01:13 +02:00
Felix Bartels b1b04859dc remove --pull again from Makefile (#162)
doing docker build --pull messes with chained builds (base -> php -> webapp)

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-05-27 08:06:34 +02:00
Felix Bartels 394a6de790 remove testing container after test-ci run
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-05-20 09:57:53 +02:00
Felix Bartels 4bf877b791 make sure to pull in updates for the base image (#159)
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-05-18 11:26:49 +02:00
Felix Bartels 7affd26ff8 add kopano-ldap to make-publish
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-05-14 07:46:21 +02:00
Felix Bartels 5dd163467d Add tag to kopano_ssl image (#152)
switch kopano_ssl from apline:latest to alpine:3.9
add tagging and publishing of tag to Makefile
update version of Konnect and Kweb since they have been update meanwhile
2019-05-10 20:30:37 +02:00
Felix Bartels 124eb25513 Add second ldap image without demo data (#150)
* have a separate ldap container for demo data
* add question to setup.sh about demo users
* make ldap container switchable
* piggyback small fixup for search failing when starting directly after kopano-server

fixes #53
2019-05-09 09:22:33 +02:00
Felix Bartels 1ef85eb1ba Merge pull request #149 from fbartels/kopano-demo
add small modification for use on demo.kopano.com
2019-05-03 10:13:24 +02:00
Felix Bartels 51593d7c68 add small modification for use on demo.kopano.com
on demo systems one can now run `make build-webapp-demo` and then get a kopano_webapp container with added login hints

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-05-03 10:05:03 +02:00
Felix Bartels 10a9f19689 add basic python image (#147)
* add basic python image

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

* add python image to tagging and publishing

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-05-02 18:17:26 +02:00
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 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 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 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 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