summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorFelix <me@nutomic.com>2020-04-13 15:06:41 +0200
committerFelix <me@nutomic.com>2020-04-13 15:06:41 +0200
commitfdaf0b33642fec0e3e47b86cd7284b2fcea13ce9 (patch)
treed35aeb00bcae525aa860de9ec6b6aefadf5e7f28 /docker
parentfac1cc7e1dc3b78aa48ae8c945c8c1cbd9e7fc9e (diff)
Get inbox working properly
Diffstat (limited to 'docker')
-rw-r--r--docker/federation/docker-compose.yml2
-rwxr-xr-xdocker/federation/run-federation-test.bash8
2 files changed, 7 insertions, 3 deletions
diff --git a/docker/federation/docker-compose.yml b/docker/federation/docker-compose.yml
index f251a4f9..fa95dc20 100644
--- a/docker/federation/docker-compose.yml
+++ b/docker/federation/docker-compose.yml
@@ -28,6 +28,7 @@ services:
- LEMMY_FEDERATION__TLS_ENABLED=false
- LEMMY_PORT=8540
- RUST_BACKTRACE=1
+ - RUST_LOG=actix_web=debug
restart: always
depends_on:
- postgres_alpha
@@ -58,6 +59,7 @@ services:
- LEMMY_FEDERATION__TLS_ENABLED=false
- LEMMY_PORT=8550
- RUST_BACKTRACE=1
+ - RUST_LOG=actix_web=debug
restart: always
depends_on:
- postgres_beta
diff --git a/docker/federation/run-federation-test.bash b/docker/federation/run-federation-test.bash
index 7cf26206..62bc1e8b 100755
--- a/docker/federation/run-federation-test.bash
+++ b/docker/federation/run-federation-test.bash
@@ -1,9 +1,11 @@
#!/bin/bash
set -e
-pushd ../../ui/ || exit
-yarn build
-popd || exit
+if [ "$1" = "-yarn" ]; then
+ pushd ../../ui/ || exit
+ yarn build
+ popd || exit
+fi
pushd ../../server/ || exit
cargo build