Merge branch 'main' into bc/2049/rafiki-to-rafiki-test

localenv/cloud-nine-wallet/docker-compose.yml

@@ -124,7 +124,3 @@ services:
 
 volumes:
   database-data: # named volumes can be managed easier using docker-compose
-
-networks:
-  rafiki:
-    external: true

localenv/happy-life-bank/docker-compose.yml

@@ -89,7 +89,3 @@ services:
     depends_on:
       - cloud-nine-admin
       - happy-life-backend
-
-networks:
-  rafiki:
-    external: true

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

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",