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

289 Commits

Author SHA1 Message Date
cguentherTUChemnitz e94dfb7fff container restart unless stopped (#199)
* add restart statements to all services except ssl
* requested change: explicit no restart on scheduler
2019-07-04 15:40:12 +02:00
Felix Bartels 8dce0677c0 uncomment kopano-cli as its back in master
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-06-24 09:23:40 +02:00
Felix Bartels 6115b8aee4 Make it possible for users to customise exposed ports (#182)
* move portmapping into docker-compose.ports.yml

Ensure loading of docker-compose.ports.yml via COMPOSE_FILE in .env.

* instruct users to put overridden ports into override.yml
2019-06-23 21:06:35 +02:00
Felix Bartels f18e19b5b3 update descriptions on docker hub (#191)
* add script to update image description on docker hub
* also set (short) description

fixes #179

* add optional step to makefile to update docker hub readme files

to update readme on docker hub add DOCKERREADME=yes to .env (values of variable is irrelevant, only that it its set)

* add docker_repo to .env

this fixes tagging of images for docker orgs other than the default value
2019-06-23 20:56:38 +02:00
Felix Bartels 371e7a0039 Document minimal versions required for docker and compose (#190)
* 1.19.0 is currently the minimal version you need to have to run this project

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

* mention minimal required versions in readme

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-06-23 08:49:10 +02:00
Felix Bartels f0cc708933 Add softdelete and backup to scheduler (#189)
* disable soft delete in kopano-server and add cron in scheduler to execute it there (fixes #187)
* fix cron example for backup
2019-06-21 07:50:48 +02:00
Felix Bartels 4d2cffbe09 Add linting for yaml files (#186)
* rename check-scripts target to lint
* install yamllint through pip on travis
* add yamllint config, do not fail on too long lines
* fix yaml linting errors
* remove circular dependency
2019-06-19 18:08:36 +02:00
Felix Bartels e4983a96a2 don't restart scheduler when it fails to start (#188)
it could cause a restart loop when one of the cron commands fail to execute. rather let the container stop instead.
2019-06-19 17:48:54 +02:00
Felix Bartels e0792a39a5 rework test image (#185)
use scheduler image as base
after dockerize round also execute some other commands
clean up test containers after run
switch kopano-admin to listing users (also more helpful when debugging)
comment kopano-cli for the moment
2019-06-16 10:59:42 +02:00
Felix Bartels adfbfeb4a3 fail make target when docker wait returns with non zero output (#184)
just install python3-minimal in base
clear apt key todo
rework test-ci to fail when the test containers exits with error code != 1
2019-06-15 19:21:54 +02:00
Felix Bartels aa2b8332dd add data volume for webapp session data (#183)
this makes it possible for logged in users to roam between instances of kopano webapp
2019-06-15 11:48:15 +02:00
Felix Bartels ff13679679 update Konnect to latest upstream (#178)
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-06-13 09:45:19 +02:00
Felix Bartels c870d5a739 use version sort for proper ordering (#180)
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-06-13 08:30:06 +02:00
zokradonh 4a2167c4e5 Merge pull request #177 from zokradonh/zokradonh-patch-1
Use jq's -r switch instead of sed
2019-06-13 01:44:28 +02:00
zokradonh f363073c84 Use jq's -r switch instead of sed
Use jq's -r switch instead of sed to remove double-quotes.
2019-06-12 13:17:18 +02:00
Felix Bartels 4bcb092266 transition to all versions numbers in labels (#175)
* update supercronic to the latest release
* update tagging for base
* fix version tag for core
* put versions for all containers into labels instead
* define vcf_ref once
* remove cache-from as caches will be invalidated early on because of passing the git ref early on
* do not rebuild when publishing
* do not rebuild when publishing
* reduce layers required for env assignment
* pull newer base images for kdav, scheduler and ssl if available
* alsp publish tag for ldap containers
* fix publishing of ssl container
2019-06-11 10:26:59 +02:00
Felix Bartels 787857e2f7 rename COMPOSE_FILE to not conflict with the env setting for this (#173)
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-06-07 22:00:03 +02:00
Felix Bartels 02d12ff317 Merge pull request #170 from cguentherTUChemnitz/master
traefik-proxy-subdomain.md setup guide
2019-06-07 14:38:54 +02:00
cguentherTUChemnitz eacadab501 Create traefik-proxy-subdomain.md 2019-06-07 13:26:43 +02:00
Felix Bartels 7eb769652d Update LDAP demo data for multi tenant setups (#168)
* split up ldap demo data for multi tenant setups
* replace pictures with new ones from https://www.pexels.com/search/people/ (free license without the need for attribution)
2019-06-05 09:34:55 +02:00
Felix Bartels 3a0ad6d4af smaller improvements to setup.sh (#153)
* replace bash function to list docker tags with https://github.com/genuinetools/reg/
  * this depends on new release in https://github.com/genuinetools/reg/issues/186 to fully function
* update docker version
* fix version.sh to also show versions from repos defined in .env
* add script to list available tags and update values in .env
* define default values for all version vars
* add previously missing containers
* use command instead of hash in update env script
* use a custom select function instead shell builtin (since it does not handle default values)
* add setup-update-tag in test.exp
2019-05-31 09:37:36 +02:00
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 e4b391be4f add some more documentation about used ports (#161)
also add more ports to docker-compose.yml

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-05-22 12:03:56 +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 67219e46cc fixup check for jq in version.sh (#158)
replace kopano-cli in scheduler container (for the moment, binary is currently missing in master)

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-05-16 22:00:28 +02:00
Felix Bartels 38d9993b68 fix yes set as timezone (#157)
* fix yes set as timezone

value_default would not be empty but rather have yes as the value

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

* also add version control for ssl and kweb

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-05-14 15:17:32 +02:00
Felix Bartels 3a886cfbeb Revert "add test to travis to check if all images in compose can be pulled from docker hub (and can also be started)"
This reverts commit 0e6ca288ef.
2019-05-14 10:27:06 +02:00
Felix Bartels cc828eddbd no more python2 in core:master
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-05-14 09:38:13 +02:00
Felix Bartels 0e6ca288ef add test to travis to check if all images in compose can be pulled from docker hub (and can also be started)
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-05-14 08:20:34 +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 0f98176282 do not upgrade dependencies when installing additional dependencies (#151)
this would otherwise alter other files in the image (e.g. upgrade z-push from 2.4.5 to 2.5.0). the more sustainable approach is to bake additional packages directly into the container by building an own through the makefile.

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-05-09 13:11:45 +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 39fc0a90df fix test failure introduced with webapp demo image
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-05-08 12:24:17 +02:00
Felix Bartels bdca1cd9a0 typo fix
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-05-07 20:06:32 +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 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