Isomorphic docker (#1124)

[lemmy.git] / docker / travis / docker-compose.yml

diff --git a/docker/travis/docker-compose.yml b/docker/travis/docker-compose.yml
index 9aa7750c0f88f4233ff9fcb3c33a0bfc8b99843b..e60f50333a5c1639b37b60b60f0dfb9a0da808d2 100644 (file)
--- a/docker/travis/docker-compose.yml
+++ b/docker/travis/docker-compose.yml
@@ -1,45 +1,16 @@
 version: '3.3'
 
 services:
-  nginx:
-    image: nginx:1.17-alpine
-    ports:
-      - "8540:8540"
-      - "8550:8550"
-      - "8560:8560"
-      - "8570:8570"
-      - "8580:8580"
-    volumes:
-      # Hack to make this work from both docker/federation/ and docker/federation-test/
-      - ../federation/nginx.conf:/etc/nginx/nginx.conf
-    restart: on-failure
-    depends_on:
-      - pictrs
-      - iframely
-      - lemmy-alpha
-      - lemmy-beta
-      - lemmy-gamma
-      - lemmy-delta
-      - lemmy-epsilon
-
-  pictrs:
-    restart: always
-    image: asonix/pictrs:v0.1.13-r0
-    user: 991:991
-    volumes:
-      - ./volumes/pictrs_alpha:/mnt
-
   lemmy-alpha:
     image: dessalines/lemmy:travis
     environment:
-      - LEMMY_HOSTNAME=lemmy-alpha:8540
+      - LEMMY_HOSTNAME=lemmy-alpha:8541
       - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_alpha:5432/lemmy
       - LEMMY_JWT_SECRET=changeme
-      - LEMMY_FRONT_END_DIR=/app/dist
       - LEMMY_FEDERATION__ENABLED=true
       - LEMMY_FEDERATION__TLS_ENABLED=false
       - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-beta,lemmy-gamma,lemmy-delta,lemmy-epsilon
-      - LEMMY_PORT=8540
+      - LEMMY_PORT=8541
       - LEMMY_SETUP__ADMIN_USERNAME=lemmy_alpha
       - LEMMY_SETUP__ADMIN_PASSWORD=lemmy
       - LEMMY_SETUP__SITE_NAME=lemmy-alpha
@@ -50,6 +21,8 @@ services:
       - RUST_LOG=debug
     depends_on:
       - postgres_alpha
+    ports: 
+      - "8541:8541"
   postgres_alpha:
     image: postgres:12-alpine
     environment:
@@ -62,14 +35,13 @@ services:
   lemmy-beta:
     image: dessalines/lemmy:travis
     environment:
-      - LEMMY_HOSTNAME=lemmy-beta:8550
+      - LEMMY_HOSTNAME=lemmy-beta:8551
       - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_beta:5432/lemmy
       - LEMMY_JWT_SECRET=changeme
-      - LEMMY_FRONT_END_DIR=/app/dist
       - LEMMY_FEDERATION__ENABLED=true
       - LEMMY_FEDERATION__TLS_ENABLED=false
       - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-alpha,lemmy-gamma,lemmy-delta,lemmy-epsilon
-      - LEMMY_PORT=8550
+      - LEMMY_PORT=8551
       - LEMMY_SETUP__ADMIN_USERNAME=lemmy_beta
       - LEMMY_SETUP__ADMIN_PASSWORD=lemmy
       - LEMMY_SETUP__SITE_NAME=lemmy-beta
@@ -80,6 +52,8 @@ services:
       - RUST_LOG=debug
     depends_on:
       - postgres_beta
+    ports: 
+      - "8551:8551"
   postgres_beta:
     image: postgres:12-alpine
     environment:
@@ -92,14 +66,13 @@ services:
   lemmy-gamma:
     image: dessalines/lemmy:travis
     environment:
-      - LEMMY_HOSTNAME=lemmy-gamma:8560
+      - LEMMY_HOSTNAME=lemmy-gamma:8561
       - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_gamma:5432/lemmy
       - LEMMY_JWT_SECRET=changeme
-      - LEMMY_FRONT_END_DIR=/app/dist
       - LEMMY_FEDERATION__ENABLED=true
       - LEMMY_FEDERATION__TLS_ENABLED=false
       - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-alpha,lemmy-beta,lemmy-delta,lemmy-epsilon
-      - LEMMY_PORT=8560
+      - LEMMY_PORT=8561
       - LEMMY_SETUP__ADMIN_USERNAME=lemmy_gamma
       - LEMMY_SETUP__ADMIN_PASSWORD=lemmy
       - LEMMY_SETUP__SITE_NAME=lemmy-gamma
@@ -110,6 +83,8 @@ services:
       - RUST_LOG=debug
     depends_on:
       - postgres_gamma
+    ports: 
+      - "8561:8561"
   postgres_gamma:
     image: postgres:12-alpine
     environment:
@@ -123,14 +98,13 @@ services:
   lemmy-delta:
     image: dessalines/lemmy:travis
     environment:
-      - LEMMY_HOSTNAME=lemmy-delta:8570
+      - LEMMY_HOSTNAME=lemmy-delta:8571
       - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_delta:5432/lemmy
       - LEMMY_JWT_SECRET=changeme
-      - LEMMY_FRONT_END_DIR=/app/dist
       - LEMMY_FEDERATION__ENABLED=true
       - LEMMY_FEDERATION__TLS_ENABLED=false
       - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-beta
-      - LEMMY_PORT=8570
+      - LEMMY_PORT=8571
       - LEMMY_SETUP__ADMIN_USERNAME=lemmy_delta
       - LEMMY_SETUP__ADMIN_PASSWORD=lemmy
       - LEMMY_SETUP__SITE_NAME=lemmy-delta
@@ -141,6 +115,8 @@ services:
       - RUST_LOG=debug
     depends_on:
       - postgres_delta
+    ports: 
+      - "8571:8571"
   postgres_delta:
     image: postgres:12-alpine
     environment:
@@ -154,14 +130,13 @@ services:
   lemmy-epsilon:
     image: dessalines/lemmy:travis
     environment:
-      - LEMMY_HOSTNAME=lemmy-epsilon:8580
+      - LEMMY_HOSTNAME=lemmy-epsilon:8581
       - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_epsilon:5432/lemmy
       - LEMMY_JWT_SECRET=changeme
-      - LEMMY_FRONT_END_DIR=/app/dist
       - LEMMY_FEDERATION__ENABLED=true
       - LEMMY_FEDERATION__TLS_ENABLED=false
       - LEMMY_FEDERATION__BLOCKED_INSTANCES=lemmy-alpha
-      - LEMMY_PORT=8580
+      - LEMMY_PORT=8581
       - LEMMY_SETUP__ADMIN_USERNAME=lemmy_epsilon
       - LEMMY_SETUP__ADMIN_PASSWORD=lemmy
       - LEMMY_SETUP__SITE_NAME=lemmy-epsilon
@@ -172,6 +147,8 @@ services:
       - RUST_LOG=debug
     depends_on:
       - postgres_epsilon
+    ports: 
+      - "8581:8581"
   postgres_epsilon:
     image: postgres:12-alpine
     environment:
@@ -180,9 +157,3 @@ services:
       - POSTGRES_DB=lemmy
     volumes:
       - ./volumes/postgres_epsilon:/var/lib/postgresql/data
-
-  iframely:
-    image: dogbin/iframely:latest
-    volumes:
-      - ../iframely.config.local.js:/iframely/config.local.js:ro
-    restart: always