Revert the changes to the docker-compose.yml, we can merge the files later if necessary

This commit is contained in:
Moritz Heiber 2018-05-29 12:30:50 +02:00
parent 407095c13b
commit 5117f003fe

View file

@ -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
...