From 7855a32852a9939a4219a02f8999020751e31c34 Mon Sep 17 00:00:00 2001 From: Mechiel Lukkien Date: Sat, 1 Mar 2025 16:01:55 +0100 Subject: [PATCH] switch from docker-compose to "docker compose" now that my laptop doesn't have docker-compose anymore --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 42c4212..dbb12d0 100644 --- a/Makefile +++ b/Makefile @@ -90,25 +90,25 @@ govendor: ./genlicenses.sh test-integration: - -docker-compose -f docker-compose-integration.yml kill - -docker-compose -f docker-compose-integration.yml down + -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 kill + MOX_UID=$$(id -u) docker compose -f docker-compose-integration.yml run test + docker compose -f docker-compose-integration.yml kill imaptest-build: - -docker-compose -f docker-compose-imaptest.yml build --no-cache --pull mox + -docker compose -f docker-compose-imaptest.yml build --no-cache --pull mox imaptest-run: -rm -r testdata/imaptest/data mkdir testdata/imaptest/data - docker-compose -f docker-compose-imaptest.yml run --entrypoint /usr/local/bin/imaptest imaptest host=mox port=1143 user=mjl@mox.example pass=testtest mbox=imaptest.mbox - docker-compose -f docker-compose-imaptest.yml down + docker compose -f docker-compose-imaptest.yml run --entrypoint /usr/local/bin/imaptest imaptest host=mox port=1143 user=mjl@mox.example pass=testtest mbox=imaptest.mbox + docker compose -f docker-compose-imaptest.yml down fmt: