mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-11-14 02:24:31 +00:00
Revert the changes to the docker-compose.yml, we can merge the files later if necessary
This commit is contained in:
parent
407095c13b
commit
5117f003fe
1 changed files with 14 additions and 35 deletions
|
@ -3,58 +3,37 @@ version: '3'
|
||||||
services:
|
services:
|
||||||
nginx:
|
nginx:
|
||||||
image: nginx:alpine
|
image: nginx:alpine
|
||||||
networks:
|
|
||||||
- internal
|
|
||||||
- external
|
|
||||||
ports:
|
ports:
|
||||||
- 3000:80
|
- 3000:80
|
||||||
volumes:
|
volumes:
|
||||||
- "php-storage:/var/www/html"
|
- .:/var/www/html
|
||||||
- ./contrib/nginx.conf:/etc/nginx/conf.d/default.conf
|
- ./contrib/nginx.conf:/etc/nginx/conf.d/default.conf
|
||||||
depends_on:
|
depends_on:
|
||||||
- php
|
- php
|
||||||
|
|
||||||
php:
|
php:
|
||||||
build: .
|
build: .
|
||||||
image: pixelfed
|
|
||||||
volumes:
|
volumes:
|
||||||
- "php-storage:/var/www/html"
|
- ./storage:/var/www/html/storage
|
||||||
networks:
|
depends_on:
|
||||||
- internal
|
- mysql
|
||||||
|
- redis
|
||||||
environment:
|
environment:
|
||||||
- DB_HOST=mysql
|
- DB_HOST=mysql
|
||||||
- DB_DATABASE=pixelfed
|
- DB_DATABASE=pixelfed
|
||||||
- DB_USERNAME=${DB_USERNAME:-pixelfed}
|
- DB_USERNAME=${DB_USERNAME}
|
||||||
- DB_PASSWORD=${DB_PASSWORD:-pixelfed}
|
- DB_PASSWORD=${DB_PASSWORD}
|
||||||
- REDIS_HOST=redis
|
- REDIS_HOST=redis
|
||||||
- APP_KEY=${APP_KEY:-app_key}
|
- APP_KEY=${APP_KEY}
|
||||||
|
|
||||||
mysql:
|
mysql:
|
||||||
image: mysql:5.7
|
image: mysql:5.7
|
||||||
networks:
|
|
||||||
- internal
|
|
||||||
environment:
|
environment:
|
||||||
- MYSQL_DATABASE=pixelfed
|
- MYSQL_DATABASE=pixelfed
|
||||||
- MYSQL_USER=${DB_USERNAME:-pixelfed}
|
- MYSQL_USER=${DB_USERNAME}
|
||||||
- MYSQL_PASSWORD=${DB_PASSWORD:-pixelfed}
|
- MYSQL_PASSWORD=${DB_PASSWORD}
|
||||||
- MYSQL_RANDOM_ROOT_PASSWORD="true"
|
|
||||||
volumes:
|
volumes:
|
||||||
- "mysql-data:/var/lib/mysql"
|
- ./docker-volumes/mysql:/var/lib/mysql
|
||||||
|
|
||||||
redis:
|
redis:
|
||||||
image: redis:alpine
|
image: redis:alpine
|
||||||
volumes:
|
volumes:
|
||||||
- "redis-data:/data"
|
- ./docker-volumes/redis:/data
|
||||||
networks:
|
...
|
||||||
- internal
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
redis-data:
|
|
||||||
mysql-data:
|
|
||||||
php-storage:
|
|
||||||
|
|
||||||
networks:
|
|
||||||
internal:
|
|
||||||
internal: true
|
|
||||||
external:
|
|
||||||
driver: bridge
|
|
||||||
|
|
Loading…
Reference in a new issue