This commit is contained in:
Felix Ableitner 2020-12-11 18:09:47 +01:00
parent e7a5eff061
commit 30a1a69850
2 changed files with 16 additions and 14 deletions

View File

@ -45,7 +45,6 @@ steps:
image: ekidd/rust-musl-builder:1.47.0 image: ekidd/rust-musl-builder:1.47.0
environment: environment:
LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy
DATABASE_URL: postgres://lemmy:password@database:5432/lemmy
RUST_BACKTRACE: 1 RUST_BACKTRACE: 1
RUST_TEST_THREADS: 1 RUST_TEST_THREADS: 1
commands: commands:
@ -57,17 +56,16 @@ steps:
ref: ref:
- refs/tags/* - refs/tags/*
# cargo build --release
# mv target/x86_64-unknown-linux-musl/release/lemmy_server target/lemmy_server
- name: cargo build - name: cargo build
image: ekidd/rust-musl-builder:1.47.0 image: ekidd/rust-musl-builder:1.47.0
commands: commands:
- cargo build - cargo build
- mv target/x86_64-unknown-linux-musl/debug/lemmy_server target/lemmy_server - mv target/x86_64-unknown-linux-musl/debug/lemmy_server target/lemmy_server
- ls -la target/lemmy_server
- name: run federation tests - name: run federation tests
image: node:15-alpine3.12 image: node:15-alpine3.12
environment:
LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy
commands: commands:
- ls -la target/lemmy_server - ls -la target/lemmy_server
- apk add bash curl postgresql-client - apk add bash curl postgresql-client

View File

@ -11,52 +11,56 @@ export LEMMY_CAPTCHA__ENABLED=false
export RUST_BACKTRACE=1 export RUST_BACKTRACE=1
export RUST_LOG=debug export RUST_LOG=debug
for INSTANCE in lemmy_alpha lemmy_beta lemmy_gamma lemmy_delta lemmy_epsilon; do
psql "$LEMMY_DATABASE_URL" -c "CREATE DATABASE $INSTANCE"
done
echo "start alpha" echo "start alpha"
LEMMY_HOSTNAME=lemmy-alpha:8541 \ LEMMY_HOSTNAME=lemmy-alpha:8541 \
LEMMY_PORT=8541 \ LEMMY_PORT=8541 \
LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_alpha:5432/lemmy \ LEMMY_DATABASE_URL=postgres://lemmy:password@database:5432/lemmy_alpha \
LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-beta,lemmy-gamma,lemmy-delta,lemmy-epsilon \ LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-beta,lemmy-gamma,lemmy-delta,lemmy-epsilon \
LEMMY_SETUP__ADMIN_USERNAME=lemmy_alpha \ LEMMY_SETUP__ADMIN_USERNAME=lemmy_alpha \
LEMMY_SETUP__SITE_NAME=lemmy-alpha \ LEMMY_SETUP__SITE_NAME=lemmy-alpha \
target/lemmy_server target/lemmy_server &
echo "start beta" echo "start beta"
LEMMY_HOSTNAME=lemmy-beta:8551 \ LEMMY_HOSTNAME=lemmy-beta:8551 \
LEMMY_PORT=8551 \ LEMMY_PORT=8551 \
LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_beta:5432/lemmy \ LEMMY_DATABASE_URL=postgres://lemmy:password@database:5432/lemmy_beta \
LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-alpha,lemmy-gamma,lemmy-delta,lemmy-epsilon \ LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-alpha,lemmy-gamma,lemmy-delta,lemmy-epsilon \
LEMMY_SETUP__ADMIN_USERNAME=lemmy_beta \ LEMMY_SETUP__ADMIN_USERNAME=lemmy_beta \
LEMMY_SETUP__SITE_NAME=lemmy-beta \ LEMMY_SETUP__SITE_NAME=lemmy-beta \
target/debug/lemmy_server & target/lemmy_server &
echo "start gamma" echo "start gamma"
LEMMY_HOSTNAME=lemmy-gamma:8561 \ LEMMY_HOSTNAME=lemmy-gamma:8561 \
LEMMY_PORT=8561 \ LEMMY_PORT=8561 \
LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_gamma:5432/lemmy \ LEMMY_DATABASE_URL=postgres://lemmy:password@database:5432/lemmy_gamma \
LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-alpha,lemmy-beta,lemmy-delta,lemmy-epsilon \ LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-alpha,lemmy-beta,lemmy-delta,lemmy-epsilon \
LEMMY_SETUP__ADMIN_USERNAME=lemmy_gamma \ LEMMY_SETUP__ADMIN_USERNAME=lemmy_gamma \
LEMMY_SETUP__SITE_NAME=lemmy-gamma \ LEMMY_SETUP__SITE_NAME=lemmy-gamma \
target/debug/lemmy_server & target/lemmy_server &
echo "start delta" echo "start delta"
# An instance with only an allowlist for beta # An instance with only an allowlist for beta
LEMMY_HOSTNAME=lemmy-delta:8571 \ LEMMY_HOSTNAME=lemmy-delta:8571 \
LEMMY_PORT=8571 \ LEMMY_PORT=8571 \
LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_delta:5432/lemmy \ LEMMY_DATABASE_URL=postgres://lemmy:password@database:5432/lemmy_delta \
LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-beta \ LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-beta \
LEMMY_SETUP__ADMIN_USERNAME=lemmy_delta \ LEMMY_SETUP__ADMIN_USERNAME=lemmy_delta \
LEMMY_SETUP__SITE_NAME=lemmy-delta \ LEMMY_SETUP__SITE_NAME=lemmy-delta \
target/debug/lemmy_server & target/lemmy_server &
echo "start epsilon" echo "start epsilon"
# An instance who has a blocklist, with lemmy-alpha blocked # An instance who has a blocklist, with lemmy-alpha blocked
LEMMY_HOSTNAME=lemmy-epsilon:8581 \ LEMMY_HOSTNAME=lemmy-epsilon:8581 \
LEMMY_PORT=8581 \ LEMMY_PORT=8581 \
LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_epsilon:5432/lemmy \ LEMMY_DATABASE_URL=postgres://lemmy:password@database:5432/lemmy_epsilon \
LEMMY_FEDERATION__BLOCKED_INSTANCES=lemmy-alpha \ LEMMY_FEDERATION__BLOCKED_INSTANCES=lemmy-alpha \
LEMMY_SETUP__ADMIN_USERNAME=lemmy_epsilon \ LEMMY_SETUP__ADMIN_USERNAME=lemmy_epsilon \
LEMMY_SETUP__SITE_NAME=lemmy-epsilon \ LEMMY_SETUP__SITE_NAME=lemmy-epsilon \
target/debug/lemmy_server & target/lemmy_server &
echo "wait for all instances to start" echo "wait for all instances to start"
while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8541/api/v1/site')" != "200" ]]; do sleep 1; done while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8541/api/v1/site')" != "200" ]]; do sleep 1; done