Skip to content

Commit

Permalink
dev(setup): switch to docker compose v2 (#784)
Browse files Browse the repository at this point in the history
* dev(setup): switch to docker compose v2

* dev(setup): remove deprecated version property from docker files
  • Loading branch information
theborakompanioni authored Jul 4, 2024
1 parent 4c5a2cf commit da8b0a9
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 8 deletions.
1 change: 0 additions & 1 deletion docker/regtest/docker-compose-common.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3"

services:

Expand Down
1 change: 0 additions & 1 deletion docker/regtest/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3"

services:

Expand Down
4 changes: 2 additions & 2 deletions docker/regtest/prepare-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
# ```
#
###
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit da8b0a9

Please sign in to comment.