diff --git a/packages/backend/test-federation/compose.a.yml b/packages/backend/test-federation/compose.a.yml index 6a305b404c..0c9155d8d2 100644 --- a/packages/backend/test-federation/compose.a.yml +++ b/packages/backend/test-federation/compose.a.yml @@ -40,6 +40,10 @@ services: source: ./.config/a.test.default.yml target: /misskey/.config/default.yml read_only: true + - type: bind + source: ./.config/a.test.default.json + target: /misskey/.config/default.json + read_only: true db.a.test: extends: diff --git a/packages/backend/test-federation/compose.b.yml b/packages/backend/test-federation/compose.b.yml index 1158b53bae..ae05a8cbd4 100644 --- a/packages/backend/test-federation/compose.b.yml +++ b/packages/backend/test-federation/compose.b.yml @@ -40,6 +40,10 @@ services: source: ./.config/b.test.default.yml target: /misskey/.config/default.yml read_only: true + - type: bind + source: ./.config/b.test.default.json + target: /misskey/.config/default.json + read_only: true db.b.test: extends: diff --git a/packages/backend/test-federation/compose.tpl.yml b/packages/backend/test-federation/compose.tpl.yml index 92b986736d..3587abc5ae 100644 --- a/packages/backend/test-federation/compose.tpl.yml +++ b/packages/backend/test-federation/compose.tpl.yml @@ -38,6 +38,10 @@ services: source: ../ormconfig.js target: /misskey/packages/backend/ormconfig.js read_only: true + - type: bind + source: ../scripts + target: /misskey/packages/backend/scripts + read_only: true - type: bind source: ../package.json target: /misskey/packages/backend/package.json @@ -86,8 +90,8 @@ services: command: > bash -c " npm install -g pnpm - pnpm -F backend migrate - pnpm -F backend start + pnpm -F backend typeorm migration:run -d ormconfig.js + node ./packages/backend/built/boot/entry.js " healthcheck: test: bash /misskey/healthcheck.sh diff --git a/packages/backend/test-federation/setup.sh b/packages/backend/test-federation/setup.sh index 1bc3a2a87c..2da44e5fdc 100644 --- a/packages/backend/test-federation/setup.sh +++ b/packages/backend/test-federation/setup.sh @@ -29,6 +29,8 @@ function generate { if [ ! -f .config/docker.env ]; then cp .config/example.docker.env .config/docker.env; fi if [ ! -f .config/$1.conf ]; then sed "s/\${HOST}/$1/g" .config/example.conf > .config/$1.conf; fi if [ ! -f .config/$1.default.yml ]; then sed "s/\${HOST}/$1/g" .config/example.default.yml > .config/$1.default.yml; fi + # Pre-compile YAML config to JSON (for runtime use without js-yaml) + if [ -f .config/$1.default.yml ]; then node -e "const fs=require('fs'),yaml=require('js-yaml');fs.writeFileSync('.config/$1.default.json',JSON.stringify(yaml.load(fs.readFileSync('.config/$1.default.yml','utf-8'),{schema:yaml.JSON_SCHEMA}),null,'\t'),'utf-8')"; fi } generate a.test