From 90b8433d3c9145817955a9bc1e4076e88408e2d5 Mon Sep 17 00:00:00 2001 From: mlan Date: Mon, 16 Nov 2020 11:48:57 +0100 Subject: [PATCH] - [travis-ci](.travis.yml) Debug errors on Travis-CI --- README.md | 8 ++++---- test/Makefile | 5 ++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 39da94e..2b4e966 100644 --- a/README.md +++ b/README.md @@ -12,12 +12,12 @@ Hopefully this repository can be retired once the Kopano community make official ## Features -- Groupware server [Kopano WebApp](https://kopano.io/) +- [Kopano WebApp](https://kopano.io/) the main client to access all the features provided by Kopano core - [Exchange ActiveSync (EAS)](https://en.wikipedia.org/wiki/Exchange_ActiveSync) server [Z-Push](http://z-push.org/) -- IMAP, POP3 and ICAL service Kopano -- Secure protocols IMAPS, POP3S and ICALS. +- IMAP, POP3 and ICAL services provided by Kopano core +- Secure protocols IMAPS, POP3S and ICALS - Hooks for integrating [Let’s Encrypt](https://letsencrypt.org/) LTS certificates using the reverse proxy [Traefik](https://docs.traefik.io/) -- Multi-staged build providing the images `full` and `core` +- Multi-staged build providing the images `full` and `core` - Configuration using environment variables - Log directed to docker daemon with configurable level - Built in utility script [run](src/docker/bin/run) helping configuring Kopano components, WebApp and Z-Push diff --git a/test/Makefile b/test/Makefile index 0d3adf2..e8f7e95 100644 --- a/test/Makefile +++ b/test/Makefile @@ -102,7 +102,7 @@ DB_ENV ?= $(NET_ENV) $(SQL_ENV) \ GREP_ENV ?= TST_W8S1 ?= 1 -TST_W8S2 ?= 80 +TST_W8S2 ?= 20 TST_W8L1 ?= 20 TST_W8L2 ?= 120 @@ -156,7 +156,6 @@ test-up_1: test-up-net test-up-auth_1 # docker run -d $(DB_ENV) $(DB_VOL) $(DB_IMG) docker run -d $(APP_ENV) $(APP_VOL) $(IMG_REPO):$(call _ver,$(IMG_VER),core) - sleep $(TST_W8L1) test-up_2: test-up-net test-up-auth_2 $(TST_CERT) # @@ -205,7 +204,7 @@ test-waits_%: case $* in [1-4]) sleep $(TST_W8S1);; *) sleep $(TST_W8S2);; esac test-waitl_%: - case $* in [1-4]) sleep $(TST_W8L1);; *) sleep $(TST_W8L2);; esac + case $* in 0) sleep $(TST_W8L1);; *) sleep $(TST_W8L2);; esac test-up-net: docker network create $(NET_NAME) 2>/dev/null || true