1
0
mirror of https://github.com/zokradonh/kopano-docker.git synced 2026-08-18 03:42:56 +00:00
Commit Graph

41 Commits

Author SHA1 Message Date
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 https://github.com/zokradonh/kopano-docker/commit/48e22da9d17ab6ae658be98d0997f226924fcacb
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 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 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
Andre Zoledziowski b95814444d commit after pressing save... 2018-10-13 14:37:55 +02:00
Andre Zoledziowski 30fc849f6a merge 2018-10-13 14:32:11 +02:00
Andre Zoledziowski 8ce7f2abdc Created another image for shared scripts. 2018-10-13 14:30:28 +02:00
Felix Bartels b2b0382199 fix if casing for download_community_packages
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2018-10-12 20:16:40 +02:00
Felix Bartels 954de3757e BugFixes and optimizations
fix shellcheck warnings on download_community
remove gzip
chmod from dockerfile to script itself
better error handling if filename returns empty
apply fix to match download archives for both amd64 and all
2018-10-12 18:06:50 +02:00
Andre Zoledziowski b100bde1ef BugFix: missing dependencies. 2018-10-12 16:27:17 +02:00
Andre Zoledziowski cb06fc5a16 BugFix: platform workaround 2018-10-12 15:25:36 +02:00
Andre Zoledziowski 501c47ec9e Simplified build.sh. Updated Readme. 2018-10-12 15:00:34 +02:00
Andre Zoledziowski e1bceb173e Now using dumb-init from Debian repositories. 2018-10-02 11:48:03 +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 c2b03f28f9 BugFix: z-push missing IPC provider 2018-07-01 12:15:09 +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 5263eef879 BugFix: missing apt-get update after sources edit 2018-05-07 15:37:50 +02:00
Andre Zoledziowski 638c299c35 Subdir renaming (removed prefix) 2018-04-16 12:18:10 +02:00