From a963ec9c15140b642458a99a330b6df0a6e89593 Mon Sep 17 00:00:00 2001 From: theborakompanioni Date: Tue, 18 Jun 2024 16:34:21 +0200 Subject: [PATCH] dev(setup): switch to docker compose v2 --- docker/regtest/prepare-setup.sh | 4 ++-- package.json | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/regtest/prepare-setup.sh b/docker/regtest/prepare-setup.sh index 107468512..3d51c88a8 100755 --- a/docker/regtest/prepare-setup.sh +++ b/docker/regtest/prepare-setup.sh @@ -5,10 +5,10 @@ # This script prepares the regtest environment. # # The output of this script is a ".env.generated" file -# to be used in when running docker-compose. +# to be used in when running `docker compose`. # e.g. # ``` -# docker-compose --env-file .env.generated --file docker-compose.yml up +# docker compose --env-file .env.generated --file docker-compose.yml up # ``` # ### diff --git a/package.json b/package.json index f10472f45..2a23842da 100644 --- a/package.json +++ b/package.json @@ -58,11 +58,11 @@ "format": "prettier --write --no-error-on-unmatched-pattern 'src/**/*.{js,jsx,ts,tsx,json,css,md}'", "version": "node scripts/changelog.mjs && git checkout -b \"prepare-v${npm_package_version}-$(date +%s)\" && git add --all && git commit --message \"chore(release): v${npm_package_version}\" && git push --set-upstream origin $(git branch --show-current)", "postversion": "which gh && gh pr create --title \"chore(release): v${npm_package_version}\" --body \"Prepares the v${npm_package_version} release.\" --assignee @me --label release --repo joinmarket-webui/jam --draft", - "regtest:build": "npm run regtest:clear && docker-compose --env-file docker/regtest/.env.example --file docker/regtest/docker-compose.yml build --pull", + "regtest:build": "npm run regtest:clear && docker compose --env-file docker/regtest/.env.example --file docker/regtest/docker-compose.yml build --pull", "regtest:rebuild": "npm run regtest:build -- --no-cache", - "regtest:clear": "docker-compose --env-file docker/regtest/.env.example --file docker/regtest/docker-compose.yml down --volumes --remove-orphans", - "regtest:up": "./docker/regtest/prepare-setup.sh && docker-compose --env-file docker/regtest/.env.generated --file docker/regtest/docker-compose.yml up", - "regtest:down": "docker-compose --env-file docker/regtest/.env.example --file docker/regtest/docker-compose.yml down", + "regtest:clear": "docker compose --env-file docker/regtest/.env.example --file docker/regtest/docker-compose.yml down --volumes --remove-orphans", + "regtest:up": "./docker/regtest/prepare-setup.sh && docker compose --env-file docker/regtest/.env.generated --file docker/regtest/docker-compose.yml up", + "regtest:down": "docker compose --env-file docker/regtest/.env.example --file docker/regtest/docker-compose.yml down", "regtest:logs:jmwalletd": "docker exec -t jm_regtest_joinmarket tail -f /var/log/jam/jmwalletd_stdout.log", "regtest:logs:schedule": "docker exec -t jm_regtest_joinmarket tail -f /root/.joinmarket/logs/TUMBLE.schedule", "regtest:logs:directory_node": "docker exec -t jm_regtest_joinmarket_directory_node tail -f /var/log/jam/directory_node_stdout.log -n 200",