summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorFelix <me@nutomic.com>2020-04-10 13:37:35 +0200
committerFelix <me@nutomic.com>2020-04-10 13:37:35 +0200
commit509005fa0c702d4909440a92cb4cf744dff72a97 (patch)
tree8845b30e05b859a165cdcdbcec5937393c8f7378 /docker
parent492625f6d635a7345de71f538d9b9097d2e1c56a (diff)
Rename federation-test to federation, puller.rs to fetcher.rs
Diffstat (limited to 'docker')
-rw-r--r--docker/federation/Dockerfile (renamed from docker/federation-test/Dockerfile)0
-rw-r--r--docker/federation/docker-compose.yml (renamed from docker/federation-test/docker-compose.yml)4
-rw-r--r--docker/federation/nginx.conf (renamed from docker/federation-test/nginx.conf)0
-rwxr-xr-xdocker/federation/run-federation-test.bash (renamed from docker/federation-test/run-federation-test.bash)2
4 files changed, 3 insertions, 3 deletions
diff --git a/docker/federation-test/Dockerfile b/docker/federation/Dockerfile
index d8302ea7..d8302ea7 100644
--- a/docker/federation-test/Dockerfile
+++ b/docker/federation/Dockerfile
diff --git a/docker/federation-test/docker-compose.yml b/docker/federation/docker-compose.yml
index 91f167c4..f251a4f9 100644
--- a/docker/federation-test/docker-compose.yml
+++ b/docker/federation/docker-compose.yml
@@ -17,7 +17,7 @@ services:
restart: "always"
lemmy_alpha:
- image: lemmy-federation-test:latest
+ image: lemmy-federation:latest
environment:
- LEMMY_HOSTNAME=lemmy_alpha:8540
- LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_alpha:5432/lemmy
@@ -47,7 +47,7 @@ services:
restart: always
lemmy_beta:
- image: lemmy-federation-test:latest
+ image: lemmy-federation:latest
environment:
- LEMMY_HOSTNAME=lemmy_beta:8550
- LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_beta:5432/lemmy
diff --git a/docker/federation-test/nginx.conf b/docker/federation/nginx.conf
index 6dbe13b4..6dbe13b4 100644
--- a/docker/federation-test/nginx.conf
+++ b/docker/federation/nginx.conf
diff --git a/docker/federation-test/run-federation-test.bash b/docker/federation/run-federation-test.bash
index b9f150a0..7cf26206 100755
--- a/docker/federation-test/run-federation-test.bash
+++ b/docker/federation/run-federation-test.bash
@@ -9,6 +9,6 @@ pushd ../../server/ || exit
cargo build
popd || exit
-sudo docker build ../../ -f Dockerfile -t lemmy-federation-test:latest
+sudo docker build ../../ -f Dockerfile -t lemmy-federation:latest
sudo docker-compose up \ No newline at end of file