From ee1e58d148d0c4b164995fea7573bad02f60addf Mon Sep 17 00:00:00 2001
From: Dessalines <tyhou13@gmx.com>
Date: Tue, 15 Sep 2020 12:41:09 -0500
Subject: [PATCH] Fixing travis build, again.

---
 docker/travis/docker-compose.yml | 44 ++++++++------------------------
 1 file changed, 10 insertions(+), 34 deletions(-)

diff --git a/docker/travis/docker-compose.yml b/docker/travis/docker-compose.yml
index 08c3c2eb9..150f354a4 100644
--- a/docker/travis/docker-compose.yml
+++ b/docker/travis/docker-compose.yml
@@ -1,34 +1,6 @@
 version: '3.3'
 
 services:
-  nginx:
-    image: nginx:1.17-alpine
-    ports:
-      - "8541:8541"
-      - "8551:8551"
-      - "8561:8561"
-      - "8571:8571"
-      - "8581:8581"
-    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:
@@ -49,6 +21,8 @@ services:
       - RUST_LOG=debug
     depends_on:
       - postgres_alpha
+    ports: 
+      - "8541:8541"
   postgres_alpha:
     image: postgres:12-alpine
     environment:
@@ -78,6 +52,8 @@ services:
       - RUST_LOG=debug
     depends_on:
       - postgres_beta
+    ports: 
+      - "8551:8551"
   postgres_beta:
     image: postgres:12-alpine
     environment:
@@ -107,6 +83,8 @@ services:
       - RUST_LOG=debug
     depends_on:
       - postgres_gamma
+    ports: 
+      - "8561:8561"
   postgres_gamma:
     image: postgres:12-alpine
     environment:
@@ -137,6 +115,8 @@ services:
       - RUST_LOG=debug
     depends_on:
       - postgres_delta
+    ports: 
+      - "8571:8571"
   postgres_delta:
     image: postgres:12-alpine
     environment:
@@ -167,6 +147,8 @@ services:
       - RUST_LOG=debug
     depends_on:
       - postgres_epsilon
+    ports: 
+      - "8571:8571"
   postgres_epsilon:
     image: postgres:12-alpine
     environment:
@@ -175,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