Combination of Single Player and Dev repo work, fixes

This commit is contained in:
Marwolf
2018-07-12 09:51:51 -04:00
parent e4031bcb97
commit e5a51c328a
117 changed files with 21621 additions and 77 deletions

View File

@@ -3,10 +3,10 @@ services:
web:
image: nginx:alpine
volumes:
- "./Website/etc/nginx/default.conf:/etc/nginx/conf.d/default.conf"
- "./Website/etc/ssl:/etc/ssl"
- "./Website/Open-RSC-Website:/var/www/html/public"
- "./Website/etc/nginx/default.template.conf:/etc/nginx/conf.d/default.template"
- "./etc/nginx/default.conf:/etc/nginx/conf.d/default.conf"
- "./etc/ssl:/etc/ssl"
- "./Website:/var/www/html/public"
- "./etc/nginx/default.template.conf:/etc/nginx/conf.d/default.template"
ports:
- "80:80"
- "443:443"
@@ -21,8 +21,8 @@ services:
image: nanoninja/php-fpm:${PHP_VERSION}
restart: always
volumes:
- "./Website/etc/php/php.ini:/usr/local/etc/php/conf.d/php.ini"
- "./Website/Open-RSC-Website:/var/www/html/public"
- "./etc/php/php.ini:/usr/local/etc/php/conf.d/php.ini"
- "./Website:/var/www/html/public"
myadmin:
image: phpmyadmin/phpmyadmin
container_name: phpmyadmin
@@ -35,7 +35,7 @@ services:
depends_on:
- mysqldb
mysqldb:
image: mysql:${MYSQL_VERSION}
image: mariadb:latest
container_name: ${MYSQL_HOST}
restart: always
env_file:
@@ -48,4 +48,4 @@ services:
ports:
- "3306:3306"
volumes:
- "./Website/data/db/mysql:/var/lib/mysql"
- "./data/db/mysql:/var/lib/mysql"