1
0
mirror of https://github.com/zokradonh/kopano-docker synced 2025-06-10 17:36:19 +00:00

22 Commits

Author SHA1 Message Date
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
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
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
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
Philipp Holzer
a7e23ee53b
Adding MDM / FILE / Spell support during setup.sh 2018-12-13 20:25:06 +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
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
Andre Zoledziowski
8ce7f2abdc
Created another image for shared scripts. 2018-10-13 14:30:28 +02:00
Andre Zoledziowski
d535895cdc
BugFix: missing z-push logs, migrated to new z-push config 2018-07-01 12:16:12 +02:00
Andre Zoledziowski
b5d30b13d7
Added comfort functions & minor 2018-06-28 10:39:09 +02:00
Andre Zoledziowski
fde2c566c9 New: WebApp now support supported repositories 2018-06-25 19:05:46 +02:00
Andre Zoledziowski
638c299c35 Subdir renaming (removed prefix) 2018-04-16 12:18:10 +02:00