diff --git a/ci/runchecks.sh b/ci/runchecks.sh index c8bc15fc..0eb0fef6 100755 --- a/ci/runchecks.sh +++ b/ci/runchecks.sh @@ -1,24 +1,24 @@ #!/bin/bash set -x set -e # Setup git stash git pull docker compose pull --ignore-buildable env HOST=kolab.local ADMIN_PASSWORD=simple123 bin/configure.sh config.demo bin/quickstart.sh --nodev # Ensure the environment is functional # env ADMIN_USER=john@kolab.org ADMIN_PASSWORD=simple123 bin/selfcheck.sh ADMIN_USER=john@kolab.org ADMIN_PASSWORD=simple123 APP_DOMAIN=$(grep APP_DOMAIN .env | tail -n1 | sed "s/APP_DOMAIN=//") docker compose exec postfix testsaslauthd -u "$ADMIN_USER" -p "$ADMIN_PASSWORD" docker compose exec imap testsaslauthd -u "$ADMIN_USER" -p "$ADMIN_PASSWORD" -docker compose -f docker-compose.build.yml run -ti --rm utils ./kolabendpointtester.py --verbose --host "$APP_DOMAIN" --dav "https://$APP_DOMAIN/dav/" --imap "$APP_DOMAIN" --activesync "$APP_DOMAIN" --user "$ADMIN_USER" --password "$ADMIN_PASSWORD" +docker compose -f docker-compose.yml -f docker-compose.build.yml run -ti --rm utils ./kolabendpointtester.py --verbose --host "$APP_DOMAIN" --dav "https://$APP_DOMAIN/dav/" --imap "$APP_DOMAIN" --activesync "$APP_DOMAIN" --user "$ADMIN_USER" --password "$ADMIN_PASSWORD" # Run the tests docker rm kolab-tests >/dev/null 2>/dev/null || : docker run --rm --network=kolab_kolab -v ${PWD}/src:/src/kolabsrc.orig --name kolab-tests -t kolab-tests /init.sh testsuite diff --git a/docker-compose.build.yml b/docker-compose.build.yml index d95e3b96..e1d2b612 100644 --- a/docker-compose.build.yml +++ b/docker-compose.build.yml @@ -1,18 +1,23 @@ version: '3' services: swoole: build: context: ./docker/swoole/ container_name: kolab-swoole image: apheleia/swoole tests: build: context: ./docker/tests/ container_name: kolab-tests image: kolab-tests utils: build: context: ./docker/utils/ container_name: kolab-utils image: kolab-utils - network_mode: "host" + dns: 172.18.0.11 + extra_hosts: + - "${APP_DOMAIN}:172.18.0.7" + networks: + kolab: + ipv4_address: 172.18.0.27