From 5117f003fe547968aa1fbca851190b276d6dcec2 Mon Sep 17 00:00:00 2001
From: Moritz Heiber <mheiber@thoughtworks.com>
Date: Tue, 29 May 2018 12:30:50 +0200
Subject: [PATCH] Revert the changes to the docker-compose.yml, we can merge
 the files later if necessary

---
 docker-compose.yml | 49 +++++++++++++---------------------------------
 1 file changed, 14 insertions(+), 35 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index b49b77a77..d9c39bd2f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,58 +3,37 @@ version: '3'
 services:
   nginx:
     image: nginx:alpine
-    networks:
-      - internal
-      - external
     ports:
     - 3000:80
     volumes:
-    - "php-storage:/var/www/html"
+    - .:/var/www/html
     - ./contrib/nginx.conf:/etc/nginx/conf.d/default.conf
     depends_on:
-      - php
-
+    - php
   php:
     build: .
-    image: pixelfed
     volumes:
-    - "php-storage:/var/www/html"
-    networks:
-      - internal
+    - ./storage:/var/www/html/storage
+    depends_on:
+    - mysql
+    - redis
     environment:
       - DB_HOST=mysql
       - DB_DATABASE=pixelfed
-      - DB_USERNAME=${DB_USERNAME:-pixelfed}
-      - DB_PASSWORD=${DB_PASSWORD:-pixelfed}
+      - DB_USERNAME=${DB_USERNAME}
+      - DB_PASSWORD=${DB_PASSWORD}
       - REDIS_HOST=redis
-      - APP_KEY=${APP_KEY:-app_key}
-
+      - APP_KEY=${APP_KEY}
   mysql:
     image: mysql:5.7
-    networks:
-      - internal
     environment:
       - MYSQL_DATABASE=pixelfed
-      - MYSQL_USER=${DB_USERNAME:-pixelfed}
-      - MYSQL_PASSWORD=${DB_PASSWORD:-pixelfed}
-      - MYSQL_RANDOM_ROOT_PASSWORD="true"
+      - MYSQL_USER=${DB_USERNAME}
+      - MYSQL_PASSWORD=${DB_PASSWORD}
     volumes:
-    - "mysql-data:/var/lib/mysql"
-
+    - ./docker-volumes/mysql:/var/lib/mysql
   redis:
     image: redis:alpine
     volumes:
-    - "redis-data:/data"
-    networks:
-      - internal
-
-volumes:
-  redis-data:
-  mysql-data:
-  php-storage:
-
-networks:
-  internal:
-    internal: true
-  external:
-    driver: bridge
+    - ./docker-volumes/redis:/data
+...