mirror of
https://github.com/mjl-/mox.git
synced 2024-12-26 16:33:47 +03:00
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.
This commit is contained in:
parent
965a2b426f
commit
9b429cce4f
1 changed files with 3 additions and 1 deletions
4
Makefile
4
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:
|
||||
|
|
Loading…
Reference in a new issue