From a7e4518131de56aa11afa6a88b8be97e2bfeeafb Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Mon, 1 Dec 2025 14:10:51 +0900 Subject: [PATCH] Revert "Fix federation test: add scripts mount and pre-compile config on host" This reverts commit d6d5606d68c6d205ceb5d4366214fb66ff5a669f. --- packages/backend/test-federation/compose.a.yml | 4 ---- packages/backend/test-federation/compose.b.yml | 4 ---- packages/backend/test-federation/compose.tpl.yml | 8 ++------ packages/backend/test-federation/setup.sh | 2 -- 4 files changed, 2 insertions(+), 16 deletions(-) diff --git a/packages/backend/test-federation/compose.a.yml b/packages/backend/test-federation/compose.a.yml index 0c9155d8d2..6a305b404c 100644 --- a/packages/backend/test-federation/compose.a.yml +++ b/packages/backend/test-federation/compose.a.yml @@ -40,10 +40,6 @@ 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 ae05a8cbd4..1158b53bae 100644 --- a/packages/backend/test-federation/compose.b.yml +++ b/packages/backend/test-federation/compose.b.yml @@ -40,10 +40,6 @@ 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 3587abc5ae..92b986736d 100644 --- a/packages/backend/test-federation/compose.tpl.yml +++ b/packages/backend/test-federation/compose.tpl.yml @@ -38,10 +38,6 @@ 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 @@ -90,8 +86,8 @@ services: command: > bash -c " npm install -g pnpm - pnpm -F backend typeorm migration:run -d ormconfig.js - node ./packages/backend/built/boot/entry.js + pnpm -F backend migrate + pnpm -F backend start " healthcheck: test: bash /misskey/healthcheck.sh diff --git a/packages/backend/test-federation/setup.sh b/packages/backend/test-federation/setup.sh index 2da44e5fdc..1bc3a2a87c 100644 --- a/packages/backend/test-federation/setup.sh +++ b/packages/backend/test-federation/setup.sh @@ -29,8 +29,6 @@ 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