diff --git a/docker/docker-blockchain-link-test.sh b/docker/docker-blockchain-link-test.sh index 90911e5235..e117bb0a13 100755 --- a/docker/docker-blockchain-link-test.sh +++ b/docker/docker-blockchain-link-test.sh @@ -4,4 +4,4 @@ set -e LOCAL_USER_ID="$(id -u "$USER")" export LOCAL_USER_ID -docker-compose -f ./docker/docker-compose.blockchain-link-test.yml up --build --abort-on-container-exit --force-recreate +docker compose -f ./docker/docker-compose.blockchain-link-test.yml up --build --abort-on-container-exit --force-recreate diff --git a/docker/docker-coinjoin-backend.sh b/docker/docker-coinjoin-backend.sh index 084f36848f..837e7fdd4d 100755 --- a/docker/docker-coinjoin-backend.sh +++ b/docker/docker-coinjoin-backend.sh @@ -4,4 +4,4 @@ set -e LOCAL_USER_ID="$(id -u "$USER")" export LOCAL_USER_ID -docker-compose -f ./docker/docker-compose.coinjoin-backend.yml up --build --abort-on-container-exit --force-recreate +docker compose -f ./docker/docker-compose.coinjoin-backend.yml up --build --abort-on-container-exit --force-recreate diff --git a/docker/docker-connect-popup-ci.sh b/docker/docker-connect-popup-ci.sh index 5083bea25f..f58790e7f2 100644 --- a/docker/docker-connect-popup-ci.sh +++ b/docker/docker-connect-popup-ci.sh @@ -7,4 +7,4 @@ export TEST_FILE=$1 export URL=$URL export TREZOR_CONNECT_SRC=$TREZOR_CONNECT_SRC -docker-compose -f ./docker/docker-compose.connect-popup-ci.yml up --build --abort-on-container-exit \ No newline at end of file +docker compose -f ./docker/docker-compose.connect-popup-ci.yml up --build --abort-on-container-exit diff --git a/docker/docker-connect-popup-legacy-test.sh b/docker/docker-connect-popup-legacy-test.sh index 9b33502a9b..0736727489 100755 --- a/docker/docker-connect-popup-legacy-test.sh +++ b/docker/docker-connect-popup-legacy-test.sh @@ -16,4 +16,4 @@ export URL # Make sure you run this with VPN connected otherwise previos versions of connect will not be available. -docker-compose -f ./docker/docker-compose.connect-popup-test.yml up --build --abort-on-container-exit +docker compose -f ./docker/docker-compose.connect-popup-test.yml up --build --abort-on-container-exit diff --git a/docker/docker-connect-popup-test.sh b/docker/docker-connect-popup-test.sh index cbe18e71a6..208e428e4b 100755 --- a/docker/docker-connect-popup-test.sh +++ b/docker/docker-connect-popup-test.sh @@ -7,4 +7,4 @@ export LOCAL_USER_ID export TEST_FILE=$1 export TREZOR_CONNECT_SRC=http://localhost:8088/ -docker-compose -f ./docker/docker-compose.connect-popup-test.yml up --build --abort-on-container-exit +docker compose -f ./docker/docker-compose.connect-popup-test.yml up --build --abort-on-container-exit diff --git a/docker/docker-connect-test.sh b/docker/docker-connect-test.sh index acb37d872a..bdad479bed 100755 --- a/docker/docker-connect-test.sh +++ b/docker/docker-connect-test.sh @@ -120,7 +120,7 @@ export TESTS_FIRMWARE_URL=$FIRMWARE_URL export TESTS_FIRMWARE_MODEL=$FIRMWARE_MODEL runDocker() { - docker-compose -f ./docker/docker-compose.connect-test.yml up --abort-on-container-exit + docker compose -f ./docker/docker-compose.connect-test.yml up --abort-on-container-exit } run() { diff --git a/docker/docker-connect-webextension-ci.sh b/docker/docker-connect-webextension-ci.sh index cac8d12bd9..aa6456759f 100755 --- a/docker/docker-connect-webextension-ci.sh +++ b/docker/docker-connect-webextension-ci.sh @@ -4,4 +4,4 @@ set -e HEADLESS=true export HEADLESS -docker-compose -f ./docker/docker-compose.connect-webextension-test.yml up --build --abort-on-container-exit +docker compose -f ./docker/docker-compose.connect-webextension-test.yml up --build --abort-on-container-exit diff --git a/docker/docker-connect-webextension-test.sh b/docker/docker-connect-webextension-test.sh index 050305b5c7..28aba72295 100755 --- a/docker/docker-connect-webextension-test.sh +++ b/docker/docker-connect-webextension-test.sh @@ -7,4 +7,4 @@ HEADLESS=false export LOCAL_USER_ID export HEADLESS -docker-compose -f ./docker/docker-compose.connect-webextension-test.yml up --build --abort-on-container-exit +docker compose -f ./docker/docker-compose.connect-webextension-test.yml up --build --abort-on-container-exit diff --git a/docker/docker-regtest-electrum.sh b/docker/docker-regtest-electrum.sh index e839b4c4a6..e752ff5270 100755 --- a/docker/docker-regtest-electrum.sh +++ b/docker/docker-regtest-electrum.sh @@ -4,4 +4,4 @@ set -e LOCAL_USER_ID="$(id -u "$USER")" export LOCAL_USER_ID -docker-compose -f ./docker/docker-compose.regtest-electrum.yml up --build --abort-on-container-exit --force-recreate +docker compose -f ./docker/docker-compose.regtest-electrum.yml up --build --abort-on-container-exit --force-recreate diff --git a/docker/docker-suite-desktop-test.sh b/docker/docker-suite-desktop-test.sh index fd72825c3f..20d7857c24 100755 --- a/docker/docker-suite-desktop-test.sh +++ b/docker/docker-suite-desktop-test.sh @@ -25,4 +25,4 @@ fi echo "${CONTAINERS}" -docker-compose -f ./docker/docker-compose.suite-desktop-test.yml up --build --abort-on-container-exit --remove-orphans --force-recreate ${CONTAINERS} +docker compose -f ./docker/docker-compose.suite-desktop-test.yml up --build --abort-on-container-exit --remove-orphans --force-recreate ${CONTAINERS} diff --git a/docker/docker-suite-install.sh b/docker/docker-suite-install.sh index 656fded83e..274111651c 100755 --- a/docker/docker-suite-install.sh +++ b/docker/docker-suite-install.sh @@ -2,4 +2,4 @@ set -e LOCAL_USER_ID="$(id -u "$USER")" -docker-compose -f ./docker/docker-compose.suite-base.yml run -e LOCAL_USER_ID="$LOCAL_USER_ID" --rm suite-install +docker compose -f ./docker/docker-compose.suite-base.yml run -e LOCAL_USER_ID="$LOCAL_USER_ID" --rm suite-install diff --git a/docker/docker-suite-snapshots.sh b/docker/docker-suite-snapshots.sh index f5a1367eb1..9a651a909a 100755 --- a/docker/docker-suite-snapshots.sh +++ b/docker/docker-suite-snapshots.sh @@ -9,4 +9,4 @@ export LOCAL_USER_ID export CYPRESS_SNAPSHOT=1 export CYPRESS_updateSnapshots=1 -docker-compose -f ./docker/docker-compose.suite-test.yml up --build --abort-on-container-exit +docker compose -f ./docker/docker-compose.suite-test.yml up --build --abort-on-container-exit diff --git a/docker/docker-suite-test.sh b/docker/docker-suite-test.sh index 6463bb62a2..1446547d89 100755 --- a/docker/docker-suite-test.sh +++ b/docker/docker-suite-test.sh @@ -8,4 +8,4 @@ xhost + LOCAL_USER_ID=$(id -u "$USER") export LOCAL_USER_ID -docker-compose -f ./docker/docker-compose.suite-test.yml up --build --abort-on-container-exit --force-recreate +docker compose -f ./docker/docker-compose.suite-test.yml up --build --abort-on-container-exit --force-recreate diff --git a/docker/docker-transport-test.sh b/docker/docker-transport-test.sh index 0173d450d8..a40c502560 100755 --- a/docker/docker-transport-test.sh +++ b/docker/docker-transport-test.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash set -e -docker-compose -f ./docker/docker-compose.transport-test.yml pull -docker-compose -f ./docker/docker-compose.transport-test.yml up --build --abort-on-container-exit --force-recreate +docker compose -f ./docker/docker compose.transport-test.yml pull +docker compose -f ./docker/docker-compose.transport-test.yml up --build --abort-on-container-exit --force-recreate