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

65 Commits

Author SHA1 Message Date
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
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
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
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
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
h44z
20711473fe Recreate tmp folder if it does not exist (#10)
* Recreate tmp folder if it does not exist
2020-01-24 22:03:32 +01:00
Felix Bartels
b72359d000
Print a proper (error) message when container is read-only, but packages should be installed (#321)
* print an error message instead of failing to start if container is read-only
2020-01-16 15:22:12 +01:00
Felix Bartels
70e9940b38
Run all containers read-only (#314)
* switch containers in compose file to read-only
related to https://github.com/zokradonh/kopano-docker/issues/310
* make scheduler container read-only
* make meet container read-only
* fix konnect for read-only
* make core mostly read-only
* add custom location for ldap.cfg to default config
* sort config option for readability
* update makefile pull workaround
* make kdav read-only
* remove locale generation code from core startup
* fix commander tests
* fix store language tests
* add test for a dutch mailbox
* make it possible to run webapp read-only
* add locale hint to the compose file
* finish read-only mode for z-push
2020-01-14 14:31:53 +01:00
Felix Bartels
574e9de669
print version at startup (#312)
* print version at startup

fixes #285
2019-12-22 18:10:50 +01:00
Felix Bartels
ead0acfdb0
Add a per setup unique machine-id (#257)
* add mount for machine-id
* services should check the availability of the machine id before starting
* add a note to the readme
* add new mounts to the multiserver example
* add dockerize to kweb
* fix meet demo
2019-11-19 13:55:11 +01:00
Felix Bartels
e74da7b832
run apt non-interactive to prevent package questions (like config updates) during install (#272)
relates to https://github.com/zokradonh/kopano-docker/issues/261

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-10-29 10:14:44 +01:00
Felix Bartels
80a3b2a563
experiment with overriding exec to test bash script functions (#254)
* experiment with overriding exec to test bash script functions

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

* refine tests

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

* test installation of packages

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

* make sure package list is not updated when there are not additional packages

* basic commander tests for webapp

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

* add webapp commander to makefile

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

* basic tests for webapp

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

* check webapp config.php

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

* add tests for z-push

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-10-08 23:00:36 +02:00
Felix Bartels
b273c87cb3
More tests (#240)
* add goss healthcheck to meet
* add goss healthcheck to scheduler
* enhance goss tests for webapp
* add meet and scheduler to make target for goss
* fix healtcheck for webapp

will report 200, but also cause an error because of it being requested over plain
have dedicated url for check
* disable stats reporting in build
* update commander
2019-09-15 18:01:09 +02:00
Felix Bartels
26c45ce1db
cut quotes from additional package var earlier on (#224)
* cut quotes from additional package var earlier on
* add easy debugging switch to script and predefine env var in base image
2019-08-28 20:49:31 +02:00
Felix Bartels
4878fc9917
Use goss for healthchecks (#223)
* basic healthcheck based on goss
* add goss to travis
* healtcheck command runs now for all services
* add to makefile
2019-08-27 14:56:49 +02:00
Felix Bartels
d6744b20e2
Add test implementation of goss (#222)
* add test target for goss
split test-ci up to later add goss to it
* bring back chown of /kopano/data
* use a dedicated goss file for kopano-server
* add todo
2019-08-24 15:40:56 +02:00
zokradonh
b0236bf0d8 Cure some quoting issues
* Double quotes not needed by docker compose

Same issue as here https://github.com/zokradonh/kopano-docker/issues/216

* move deletion of tmpfile into an exit trap

otherwise the file is not cleaned up when supported images are built

* repair sourcing of env by removing kopano ldap settings from env before sourcing

* additional packages env vars should be quoted in .env
* adapt start scripts to handle quotes additional packages
* treat update-tag script with ldap variable fix from setup.sh

fixes #216

* run version.sh in travis (to fail early if something is wrong there)
commit forgotten fixes to start scripts
2019-08-22 09:21:10 +02:00
Felix Bartels
ae7f679be2
remove obsolete (and wrong) "starting apache" line (#214)
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-08-13 07:38:54 +02:00
Felix Bartels
fb37723cc3
Enforce .editorconfig by running eclint (#213)
* tune .editorconfig for the existing files
* fix reported linting issues
* travis: switch language to node_js to be able to run npm
* travis: build on ubuntu bionic
2019-08-12 16:14:45 +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
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
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
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
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
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
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 48e22da9d1
2019-04-14 10:31:49 +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
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
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
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
b21beb96c2 shellcheck for webapp
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-02-26 17:00:32 +01:00
Felix Bartels
72846074d6 add docker-file to run webapp standalone
tweak start.sh in webapp image so that it only gets the package list when there are actual packages to install

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-02-05 21:55:20 +01:00
Felix Bartels
6a14fbe174
build fixes and readme improvements (#85)
* add compose to the build image
* update readme
* fine tuning for build container
* directly pass commands to run script in build env
* fix dockerfile so that everything can be build on Docker version 17.05.0-ce, build 9f07f0e-synology
2019-01-28 11:07:06 +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
Philipp Holzer
a7e23ee53b
Adding MDM / FILE / Spell support during setup.sh 2018-12-13 20:25:06 +01:00
Philipp
73ad2ef079
Adding KOPANO_SMIME_VERSION 2018-12-13 20:24:01 +01:00
Philipp
c4ed16029d
Adding S/MIME support to webapp 2018-12-13 20:24:00 +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
07ea7b92bf unsed kcconf_ env variables before starting up the individual services
fixes https://github.com/zokradonh/kopano-docker/issues/4

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2018-11-21 17:06:24 +01:00
Felix Bartels
58081c9d41 set a different workdir, that can be easily mounted over
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2018-11-19 13:13:15 +01:00
Andre Zoledziowski
74982ddc4c
Solved debian frontend docker build warnings 2018-11-12 16:05:40 +01:00
zokradonh
8ac5b4ea37 Invalid command ending (#20) 2018-11-11 16:01:14 +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
6282c45340 remove cleared todos
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2018-10-16 08:32:03 +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
Andre Zoledziowski
7a73d9087c
fix supported build 2018-10-13 15:32:42 +02:00