Merge branch 'federation' into dev_1

[lemmy.git] / docker / federation-test / docker-compose.yml

diff --git a/docker/federation-test/docker-compose.yml b/docker/federation-test/docker-compose.yml
index b7df6e20e83607bcad4512166bdce8f76df352e8..2a8b0fc3262f278c7927b0e7aef2a01ab762c3a6 100644 (file)
--- a/docker/federation-test/docker-compose.yml
+++ b/docker/federation-test/docker-compose.yml
@@ -4,15 +4,15 @@ services:
   lemmy_alpha:
     image: lemmy-federation-test:latest
     ports:
-      - "127.0.0.1:8536:8536"
+      - "127.0.0.1:8540:8540"
     environment:
-      - LEMMY_HOSTNAME=localhost:8536
+      - LEMMY_HOSTNAME=localhost:8540
       - LEMMY_DATABASE_URL=postgres://lemmy:password@lemmy_db_alpha:5432/lemmy
       - LEMMY_JWT_SECRET=changeme
       - LEMMY_FRONT_END_DIR=/app/dist
       - LEMMY_FEDERATION_ENABLED=true
-      - LEMMY_FEDERATED_INSTANCE=lemmy_beta:8537
-      - LEMMY_PORT=8536
+      - LEMMY_FEDERATED_INSTANCE=lemmy_beta:8541
+      - LEMMY_PORT=8540
       - RUST_BACKTRACE=1
     restart: always
     depends_on:
@@ -26,26 +26,26 @@ services:
     volumes:
       - lemmy_db_alpha:/var/lib/postgresql/data
     restart: always
-  lemmy_pictshare_alpha:
-    image: shtripok/pictshare:latest
-    ports:
-      - "127.0.0.1:8540:80"
-    volumes:
-      - lemmy_pictshare_alpha:/usr/share/nginx/html/data
-    restart: always
+  # lemmy_pictshare_alpha:
+  #   image: shtripok/pictshare:latest
+  #   ports:
+  #     - "127.0.0.1:8550:80"
+  #   volumes:
+  #     - lemmy_pictshare_alpha:/usr/share/nginx/html/data
+  #   restart: always
 
   lemmy_beta:
     image: lemmy-federation-test:latest
     ports:
-      - "127.0.0.1:8537:8537"
+      - "127.0.0.1:8541:8541"
     environment:
-      - LEMMY_HOSTNAME=localhost:8537
+      - LEMMY_HOSTNAME=localhost:8541
       - LEMMY_DATABASE_URL=postgres://lemmy:password@lemmy_db_beta:5432/lemmy
       - LEMMY_JWT_SECRET=changeme
       - LEMMY_FRONT_END_DIR=/app/dist
       - LEMMY_FEDERATION_ENABLED=true
-      - LEMMY_FEDERATED_INSTANCE=lemmy_alpha:8536
-      - LEMMY_PORT=8537
+      - LEMMY_FEDERATED_INSTANCE=lemmy_alpha:8540
+      - LEMMY_PORT=8541
       - RUST_BACKTRACE=1
     restart: always
     depends_on:
@@ -59,16 +59,16 @@ services:
     volumes:
       - lemmy_db_beta:/var/lib/postgresql/data
     restart: always
-  lemmy_pictshare_beta:
-    image: shtripok/pictshare:latest
-    ports:
-      - "127.0.0.1:8541:80"
-    volumes:
-      - lemmy_pictshare_beta:/usr/share/nginx/html/data
-    restart: always
+  # lemmy_pictshare_beta:
+  #   image: shtripok/pictshare:latest
+  #   ports:
+  #     - "127.0.0.1:8551:80"
+  #   volumes:
+  #     - lemmy_pictshare_beta:/usr/share/nginx/html/data
+  #   restart: always
 
 volumes:
   lemmy_db_alpha:
-  lemmy_pictshare_alpha:
+  # lemmy_pictshare_alpha:
   lemmy_db_beta:
-  lemmy_pictshare_beta:
+  # lemmy_pictshare_beta: