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

58 Commits

Author SHA1 Message Date
Felix Bartels
97ebd264d6 Mount /var/lib/dbus/machine-id from /etc/machine-id
Fixes https://github.com/zokradonh/kopano-docker/issues/371

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2020-03-27 14:54:51 +01:00
Felix Bartels
5ed1d05fe7
transform LDAP_SERVER to LDAP_HOST (#355)
SASL only wants the host, not the uri

Fixes https://github.com/zokradonh/kopano-docker/issues/354

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2020-03-06 09:59:31 +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
37b414303d spelling
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2020-02-02 05:37:57 +01:00
Felix Bartels
3367b539b7
move external components to their own files (#319)
* move ldap to its own file
* add separate files for db and mail as well
* add new compose file to the default compose_file variable
* enhance setup.sh to add these new compose files if they are currently missing
2020-01-15 13:26:30 +01:00
Felix Bartels
d531ac4b1c
Fixes (#283)
* make readme of owncloud more clear
* clarify setup.sh
* make user23 an admin by default
* remove hard depenency on reg
* add completed message
* set more attributes on startup

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

* use cn instead of uid
* add config for owncloud phoenix ui and openid plugin
* add override for experimental feature endpoint
* import kweb-calendar.cfg
* experimental endpoint is yes/no
* grapi also needs the ability to run insecure
* grapi needs to resolve the domain, therefore needs to be in the web network
2019-11-12 22:23:38 +01:00
Felix Bartels
c49da1d5eb
Store language (#251)
* clean out unneeded locales
* add test to verify that language is picked up in admin.cfg
* add basic question for language and use variable in compose
* use scriptlet to generate locales before start of kopano-server
* add script to check folders of a given mailbox (for language checks)
* add tests for locale generation

relates to #248
2019-10-15 09:24:10 +02:00
Felix Bartels
1de183766d
replace hexdump (#250) 2019-10-05 22:56:12 +02:00
Felix Bartels
8135321201
Add example compose file to run Meet without Kopano (#217)
* Add example compose file to run Meet without Kopano
* add readme 
* add an example env file
* add setup.sh so user can easily create their own
* use kopano repo by default
2019-09-06 13:19:13 +02:00
Felix Bartels
de66536525
Fix version detection in version.sh and add testing for it (#225)
* fix version syntax
* commander: verify output of version.sh
* commander: exit setup.sh with code 1 when .env exists
* add commander to travis
* minimal test for commander in core container
2019-08-30 18:22:36 +02:00
Felix Bartels
a7f0d298ad
make it possible to redirect to another url, than /webapp (#221)
* make it possible to redirect to another url, than /webapp
* add documentation
* define default value in container
* add value to .env through setup.sh
2019-08-22 16:57: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
45a506c7dd
Update kweb (#209)
* Update kweb to latest release
the fqdn needs to be part of kweb.cfg
make port 2015 explicit
fixes #208

* testing improvements
add git to build container
improve ci testing
add kopano-ical ports to setup


* no longer run kweb as root
now possible because of fd5c7307db
may require to manually delete the kopano_web data volume since kweb user cannot read data from root user.
2019-08-07 14:03:26 +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
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
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
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
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
bdca1cd9a0 typo fix
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-05-07 20:06:32 +02:00
Felix Bartels
caac8a5c03
wip: Implement a scheduler to run recurring tasks (such as z-push-gabsync) (#123)
* add scheduler container for gabsync
Adds a general scheduler container to trigger tasks within containers.
Also adds gabsync to zpush image
* make scheduler dynamic
execute each cron job once at startup to see if they would succeed
* remove services scripts from core container (now is part of the scheduler)
* add "CRONDELAY" for tasks that should not be executed at startup
* add documentation
* clear out crontab at startup
2019-03-24 17:33:41 +01:00
mithomas
676360dbb4 Prefix container names with COMPOSE_PROJECT_NAME. (#118)
* Prefix container names with COMPOSE_PROJECT_NAME.

This way it is easily possible to use several instances of this service stack on one host via different .env-files (e.g. for staging/production).
Volumes and networks are separated in this manner by docker-compose anyway, now the containers are too.

* Use underscore in container-names for consistency with networks and volumes.

* Remove "kopano" from container names.

This avoids repetition in the names when using the default project name which also "kopano".

* Make Caddy default port configurable.
2019-03-22 14:04:42 +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
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
r00tc0d3
3bf57693d7 Changed 'sed -r' to 'sed -E' in setup.sh for better compatibility 2019-03-10 17:28:57 +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
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
8cdd0c63f9
Unignore compose (#94)
* merge docker-compose.yml-example with docker-compose.yml
2019-02-27 12:22:03 +01:00
Felix Bartels
b8cb5f720d shellsheck
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-02-26 17:00:32 +01:00
osboxes.org
7680cfc76f alternative approach to internal name resolution
obsoletes EXTRA_HOST
2019-02-22 08:08:52 -05: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
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
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
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
3f69629278 set self-service password default values 2019-01-10 20:50:09 +01:00
Christian Günther
134aa99bb8 add preconfigured password self service as additional folder-based web service 2019-01-10 20:50:09 +01:00
Felix Bartels
789762cb34
WIP: Kopano Konnect und Rest API (#72)
* add a new image for konnect
* add konnect to compose file
* adapt gencerts for konnect certs
* integrate gencerts into start.sh and adapt if to only skip individual parts
* add container for kapi
* use same config for webapp and z-push as https://stash.kopano.io/projects/KGOL/repos/kweb/browse/config/legacy.go
* use example compose file in make test target
* make compose file configurable through an env variable
* remove legacy links in compose
* write certificates first to a tempfile
* remove unnecessary paths
* add option to run kapi insecure for testing
* configure openid for kopano-server
* add local playground to test functionality of konnect and kapi
* print errors and logs to stdout in web
* add extrahosts to kopano_server
* adapt extrahosts for ip command on ubuntu 18.04
* add documentation

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-01-09 21:57:04 +01:00
Felix Bartels
a0e045ff38 implement building and tagging through jenkins
* improve runtime by moving some variable assignments into the individual tag targets
* add expect script to run setup.sh in travis
* change language in travis
* add secrets for kopano docker account
2018-12-30 18:05:07 +01:00
Felix Bartels
63e4acca3a
Fix LDAP_QUERY_FILTER_DOMAIN
Fixes #56
2018-12-16 19:56:37 +01:00
Felix Bartels
3eefea73b1
Merge pull request #49 from nupplaphil/smime
Adding additional repositories to WebApp setup
2018-12-14 21:15:50 +01:00
Felix Bartels
db7603e764 fix versioning of z-push
add z-push version to setup.sh
remove leftover caddyfile

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2018-12-14 20:54:25 +01:00
Philipp Holzer
93bf2e23b3
Fixing intents & sort alphabetical 2018-12-13 20:26:28 +01:00
Philipp Holzer
13fc397c16
Fixing intents & sort alphabetical 2018-12-13 20:26:13 +01:00
Philipp Holzer
c0fc59594f
Adding WhatsApp4DeskApp support 2018-12-13 20:25:35 +01:00
Philipp Holzer
a7e23ee53b
Adding MDM / FILE / Spell support during setup.sh 2018-12-13 20:25:06 +01:00
Felix Bartels
faeaf75183 smaller cleanups
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2018-12-11 07:59:03 +01:00
Philipp Holzer
1d556156e9
Improving setup.sh
- Bugfixing $LDAP_BIND_DN
- Removing ADMIN-PWs for DB/LDAP in case of alternative server
- Warning message in case of not using the bundled DB/LDAP
2018-12-10 20:28:51 +01:00
Philipp Holzer
89450d8b34
Auto setup for bundled environment 2018-12-10 20:28:50 +01:00