From 9b429cce4f912e4e347e8ccb72854185fa4c2683 Mon Sep 17 00:00:00 2001 From: Mechiel Lukkien Date: Wed, 25 Dec 2024 16:44:54 +0100 Subject: [PATCH] try harder to start docker integration tests with clean slate for some reason "docker-compose down" takes a very long time, and doesn't actually stop containers if you add a timeout. --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 02fc26f..9ea2842 100644 --- a/Makefile +++ b/Makefile @@ -92,13 +92,15 @@ govendor: ./genlicenses.sh test-integration: + -docker-compose -f docker-compose-integration.yml kill + -docker-compose -f docker-compose-integration.yml down docker image build --pull --no-cache -f Dockerfile -t mox_integration_moxmail . docker image build --pull --no-cache -f testdata/integration/Dockerfile.test -t mox_integration_test testdata/integration -rm -rf testdata/integration/moxacmepebble/data -rm -rf testdata/integration/moxmail2/data -rm -f testdata/integration/tmp-pebble-ca.pem MOX_UID=$$(id -u) docker-compose -f docker-compose-integration.yml run test - docker-compose -f docker-compose-integration.yml down --timeout 1 + docker-compose -f docker-compose-integration.yml kill imaptest-build: