mirror of
https://github.com/mjl-/mox.git
synced 2025-06-28 01:48:15 +03:00
switch from docker-compose to "docker compose"
now that my laptop doesn't have docker-compose anymore
This commit is contained in:
parent
82371ad15b
commit
7855a32852
14
Makefile
14
Makefile
@ -90,25 +90,25 @@ govendor:
|
|||||||
./genlicenses.sh
|
./genlicenses.sh
|
||||||
|
|
||||||
test-integration:
|
test-integration:
|
||||||
-docker-compose -f docker-compose-integration.yml kill
|
-docker compose -f docker-compose-integration.yml kill
|
||||||
-docker-compose -f docker-compose-integration.yml down
|
-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 kill
|
docker compose -f docker-compose-integration.yml kill
|
||||||
|
|
||||||
|
|
||||||
imaptest-build:
|
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:
|
imaptest-run:
|
||||||
-rm -r testdata/imaptest/data
|
-rm -r testdata/imaptest/data
|
||||||
mkdir 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 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 down
|
||||||
|
|
||||||
|
|
||||||
fmt:
|
fmt:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user