infrastructure/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2025-06-28 10:58:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

try harder to start docker integration tests with clean slate

Browse Source 
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:
Mechiel Lukkien 2024-12-25 16:44:54 +01:00
parent 965a2b426f
commit 9b429cce4f
No known key found for this signature in database
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -92,13 +92,15 @@ govendor:
./genlicenses.sh ./genlicenses.sh
test-integration: 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 Dockerfile -t mox_integration_moxmail .
docker image build --pull --no-cache -f testdata/integration/Dockerfile.test -t mox_integration_test testdata/integration 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/moxacmepebble/data
-rm -rf testdata/integration/moxmail2/data -rm -rf testdata/integration/moxmail2/data
-rm -f testdata/integration/tmp-pebble-ca.pem -rm -f testdata/integration/tmp-pebble-ca.pem
MOX_UID=$$(id -u) docker-compose -f docker-compose-integration.yml run test 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: imaptest-build: