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

208 Commits

Author SHA1 Message Date
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 f5a24f2150 Merge pull request #107 from cguentherTUChemnitz/patch-1
switch restart always to unless-stopped
2019-03-11 19:59:57 +01:00
Felix Bartels 9dc6d76eea Merge pull request #109 from mhoffmann75/mhoffmann75-patch-zpush-proxy-header
Make real IP logging work in proxy scenario
2019-03-11 19:28:38 +01:00
Martin Hoffmann 6bd8db655b Make real IP logging work in proxy scenario
USE_CUSTOM_REMOTE_IP_HEADER should either be false or contain the name of the header to be used.
2019-03-11 18:05:07 +01:00
cguentherTUChemnitz 6e19eeba27 switch restart always to unless-stopped
I try to integrate the backup mechanisms of https://github.com/blacklabelops/volumerize, handling named volumes and automatic service stop and restart for consistent backups. Nevertheless this needs a clean stop of a service, which is only able to be achieved, if the docker restarts the containers only if they are not explicitly stopped.
2019-03-11 12:43:45 +01:00
Felix Bartels bd83306390 Merge pull request #106 from mithomas/master
Make remaining mail ports (SMTPS/MSA/IMAP) configurable.
2019-03-11 12:28:22 +01:00
Michael Thomas d378b12a2c Make remaining mail ports (SMTPS/MSA/IMAP) configurable. 2019-03-11 10:39:42 +01:00
Felix Bartels 3868b2af95 also redirect errors when checking for jq
relates to #103

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-03-10 18:47:05 +01:00
Felix Bartels 142ddc40f7 Merge pull request #104 from r00tc0d3/master
Changed 'sed -r' to 'sed -E' in setup.sh for better compatibility
2019-03-10 18:38:45 +01:00
r00tc0d3 3bf57693d7 Changed 'sed -r' to 'sed -E' in setup.sh for better compatibility 2019-03-10 17:28:57 +01:00
Felix Bartels b3af961c13 update meet config
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-03-07 14:33:28 +01:00
Felix Bartels 7ada7e87ff update kweb
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-03-07 13:04:07 +01:00
Felix Bartels 7bd9a81f45 add imap port to compose file
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-03-06 15:49:56 +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 44c7eb57f5 create admin.cfg in core image
so that it can be later filled through an env variable

relates to https://github.com/zokradonh/kopano-docker/issues/99
2019-03-05 20:46:42 +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 4507c0ae9b Merge pull request #98 from mhoffmann75/patch-1
allow local overrides to docker-compose
2019-03-05 15:01:00 +01:00
Martin Hoffmann 3257107c89 allow local overrides to docker-compose
Exclude docker-compose.override.yml file from git updates to allow for local customizations of projects docker-compose.yml file
2019-03-05 13:59:51 +01:00
Felix Bartels 10d264fa38 Add example to run meet standalone (#90)
* refactor ssl generation
make ssl certificate names match container names
add dns names to certificates
* add example to run meet and its dependencies together with an existing kopano
* update webapp example
* remove port numbers from ssl cert
as these could have been specified in a demo environment
* set default values for HTTP, HTTPS and EMAIL
fail if FQDN is unset
make smtp and kopano-server ports configurable
* add hint about 2015 to setup.sh
* also add new defaults to webapp compose
* add example for standalone core as well
2019-03-04 20:14:36 +01:00
Felix Bartels 511140a975 add smtp submission ports
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-03-01 21:51:40 +01:00
Martin Hoffmann 96d447a4e0 Enables caldav via reverse proxy (#96)
* Adds reverse proxy for Caldav

Adds reverse proxy configuration for /caldav/ running in kopano_ical container
2019-03-01 20:40:02 +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 94a2b3ad12 some more shellcheck
fixes #41

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-02-26 17:00:32 +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 b8cb5f720d shellsheck
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-02-26 17:00:32 +01:00
Felix Bartels 679249a1ac shellcheck fixes
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-02-26 17:00:32 +01:00
Felix Bartels e6f290e85f Merge pull request #89 from fbartels/centos
Improve support on CentOS
2019-02-22 22:28:43 +01:00
osboxes.org 53a5b0868c also commit changes to compose 2019-02-22 08:10:47 -05:00
osboxes.org 7680cfc76f alternative approach to internal name resolution
obsoletes EXTRA_HOST
2019-02-22 08:08:52 -05:00
osboxes.org 897a0df433 on centos7 the file is created only with -rw------- which makes konnect startup fail 2019-02-22 06:15:10 -05:00
Felix Bartels d0d3d3c852 change interval for healthcheck
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-02-20 17:01:51 +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 0fc1c3bef5 add question about the local ip to setup.sh
could partly resolve https://github.com/zokradonh/kopano-docker/issues/88

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-02-18 21:01:47 +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 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
Christian Günther 3b043334d5 support disables ssl on caddy, configured via .env 2019-01-28 22:13:24 +01:00
Christian Günther 996a65c786 document 'off' configuration in setup.sh 2019-01-28 22:13:24 +01:00
Felix Bartels 32fe88e5d8 make ldap port configurable
fix startup for grapi

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-01-28 21:37:57 +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 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 abddfcb52f switch back to uptream docker image
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-01-22 14:50:00 +01:00
Felix Bartels a630007059 add version tagging to the web and konnect image (#78) 2019-01-11 08:06:21 +01:00
Christian Günther e59d26986b use crypt hashes to store passwords via self-service 2019-01-10 20:50:09 +01:00
Christian Günther c5bb45bb3d use password reset requirements to provide some more secure passwords 2019-01-10 20:50:09 +01:00
Christian Günther e40dec737c use fixed version of self-service-password 2019-01-10 20:50:09 +01:00
Christian Günther 13acbc56f4 use fixed self-service --> has to be replaced with static release later on 2019-01-10 20:50:09 +01:00
Christian Günther 3f69629278 set self-service password default values 2019-01-10 20:50:09 +01:00