diff options
| author | Felix <me@nutomic.com> | 2020-04-24 18:30:31 +0200 |
|---|---|---|
| committer | Felix <me@nutomic.com> | 2020-04-24 18:30:31 +0200 |
| commit | c3ac1649f2d982c29da3360d39c047ea6bdd9aa2 (patch) | |
| tree | a057a7c7034758d3fd0d7de76202d698c498e845 /docker/federation | |
| parent | e5497edd5c12b1355c82b224111bf7ce5bb1fd1e (diff) | |
Implement integration test for federation
Diffstat (limited to 'docker/federation')
| -rw-r--r-- | docker/federation/docker-compose.yml | 3 | ||||
| -rwxr-xr-x | docker/federation/run-federation-test.bash | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/docker/federation/docker-compose.yml b/docker/federation/docker-compose.yml index 4f23cdcc..496e7fa6 100644 --- a/docker/federation/docker-compose.yml +++ b/docker/federation/docker-compose.yml @@ -7,7 +7,8 @@ services: - "8540:8540" - "8550:8550" volumes: - - ./nginx.conf:/etc/nginx/nginx.conf + # Hack to make this work from both docker/federation/ and docker/federation-test/ + - ../federation/nginx.conf:/etc/nginx/nginx.conf depends_on: - lemmy_alpha - pictshare_alpha diff --git a/docker/federation/run-federation-test.bash b/docker/federation/run-federation-test.bash index 2c8b681c..8486648b 100755 --- a/docker/federation/run-federation-test.bash +++ b/docker/federation/run-federation-test.bash @@ -12,6 +12,6 @@ pushd ../../server/ || exit cargo build popd || exit -sudo docker build ../../ -f Dockerfile -t lemmy-federation:latest +sudo docker build ../../ --file Dockerfile -t lemmy-federation:latest sudo docker-compose up |