mirror of
https://github.com/misskey-dev/misskey.git
synced 2026-05-21 00:35:25 +02:00
Revert "Fix federation test: add scripts mount and pre-compile config on host"
This reverts commit d6d5606d68.
This commit is contained in:
@@ -40,10 +40,6 @@ services:
|
|||||||
source: ./.config/a.test.default.yml
|
source: ./.config/a.test.default.yml
|
||||||
target: /misskey/.config/default.yml
|
target: /misskey/.config/default.yml
|
||||||
read_only: true
|
read_only: true
|
||||||
- type: bind
|
|
||||||
source: ./.config/a.test.default.json
|
|
||||||
target: /misskey/.config/default.json
|
|
||||||
read_only: true
|
|
||||||
|
|
||||||
db.a.test:
|
db.a.test:
|
||||||
extends:
|
extends:
|
||||||
|
|||||||
@@ -40,10 +40,6 @@ services:
|
|||||||
source: ./.config/b.test.default.yml
|
source: ./.config/b.test.default.yml
|
||||||
target: /misskey/.config/default.yml
|
target: /misskey/.config/default.yml
|
||||||
read_only: true
|
read_only: true
|
||||||
- type: bind
|
|
||||||
source: ./.config/b.test.default.json
|
|
||||||
target: /misskey/.config/default.json
|
|
||||||
read_only: true
|
|
||||||
|
|
||||||
db.b.test:
|
db.b.test:
|
||||||
extends:
|
extends:
|
||||||
|
|||||||
@@ -38,10 +38,6 @@ services:
|
|||||||
source: ../ormconfig.js
|
source: ../ormconfig.js
|
||||||
target: /misskey/packages/backend/ormconfig.js
|
target: /misskey/packages/backend/ormconfig.js
|
||||||
read_only: true
|
read_only: true
|
||||||
- type: bind
|
|
||||||
source: ../scripts
|
|
||||||
target: /misskey/packages/backend/scripts
|
|
||||||
read_only: true
|
|
||||||
- type: bind
|
- type: bind
|
||||||
source: ../package.json
|
source: ../package.json
|
||||||
target: /misskey/packages/backend/package.json
|
target: /misskey/packages/backend/package.json
|
||||||
@@ -90,8 +86,8 @@ services:
|
|||||||
command: >
|
command: >
|
||||||
bash -c "
|
bash -c "
|
||||||
npm install -g pnpm
|
npm install -g pnpm
|
||||||
pnpm -F backend typeorm migration:run -d ormconfig.js
|
pnpm -F backend migrate
|
||||||
node ./packages/backend/built/boot/entry.js
|
pnpm -F backend start
|
||||||
"
|
"
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: bash /misskey/healthcheck.sh
|
test: bash /misskey/healthcheck.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/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.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
|
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
|
generate a.test
|
||||||
|
|||||||
Reference in New Issue
Block a user