From d9188a282094f9dcd4988cf7e9a24c0846aabd75 Mon Sep 17 00:00:00 2001 From: Max Kurapov Date: Thu, 22 Feb 2024 18:19:23 +0100 Subject: [PATCH] chore: fix localenv networking & tigerbeetle startup (#2431) * chore: remove external network from compose files * chore: properly allow tigerbeetle to be enabled in localenv --- localenv/cloud-nine-wallet/docker-compose.yml | 4 ---- localenv/happy-life-bank/docker-compose.yml | 4 ---- localenv/tigerbeetle/docker-compose.yml | 6 ------ package.json | 2 +- 4 files changed, 1 insertion(+), 15 deletions(-) diff --git a/localenv/cloud-nine-wallet/docker-compose.yml b/localenv/cloud-nine-wallet/docker-compose.yml index 243fe66bca..dbdf6266b7 100644 --- a/localenv/cloud-nine-wallet/docker-compose.yml +++ b/localenv/cloud-nine-wallet/docker-compose.yml @@ -123,7 +123,3 @@ services: volumes: database-data: # named volumes can be managed easier using docker-compose - -networks: - rafiki: - external: true diff --git a/localenv/happy-life-bank/docker-compose.yml b/localenv/happy-life-bank/docker-compose.yml index f5ebc53777..662a891897 100644 --- a/localenv/happy-life-bank/docker-compose.yml +++ b/localenv/happy-life-bank/docker-compose.yml @@ -88,7 +88,3 @@ services: depends_on: - cloud-nine-admin - happy-life-backend - -networks: - rafiki: - external: true diff --git a/localenv/tigerbeetle/docker-compose.yml b/localenv/tigerbeetle/docker-compose.yml index e480015634..fe67e19f59 100644 --- a/localenv/tigerbeetle/docker-compose.yml +++ b/localenv/tigerbeetle/docker-compose.yml @@ -1,7 +1,5 @@ services: tigerbeetle: - env_file: - - ../tigerbeetle/.env.tigerbeetle image: ghcr.io/tigerbeetle/tigerbeetle:0.14.176 privileged: true volumes: @@ -28,7 +26,3 @@ services: ./tigerbeetle start --addresses=0.0.0.0:4342 $$DATA_FILE volumes: tigerbeetle-data: - -networks: - rafiki: - external: true diff --git a/package.json b/package.json index a0b0c089a6..bc1ead7ac3 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "clean": "find . -name 'node_modules' -type d -prune -exec rm -rf '{}' +", "build": "tsc --build", "localenv:compose:psql": "docker compose -f ./localenv/cloud-nine-wallet/docker-compose.yml -f ./localenv/happy-life-bank/docker-compose.yml ${BEFORE_MERGED:-} -f ./localenv/merged/docker-compose.yml", - "localenv:compose": "BEFORE_MERGED='-f ./localenv/tigerbeetle/docker-compose.yml' pnpm localenv:compose:psql", + "localenv:compose": "BEFORE_MERGED='-f ./localenv/tigerbeetle/docker-compose.yml --env-file ./localenv/tigerbeetle/.env.tigerbeetle' pnpm localenv:compose:psql", "localenv:seed:auth": "pnpm -C ./packages/auth knex seed:run --env=development && pnpm -C ./packages/auth knex seed:run --env=peerdevelopment", "sanity": "pnpm -r build && pnpm -r test", "localenv:compose:autopeer": "run-p tunnel:start wait-tunnel:localenv:compose",