Cleanup, wiki add

This commit is contained in:
Marwolf
2018-07-12 14:44:26 -04:00
parent 0d550e3c90
commit 2e9c422888
7 changed files with 36 additions and 57 deletions

View File

@@ -6,6 +6,7 @@ services:
- "./etc/nginx/default.conf:/etc/nginx/conf.d/default.conf"
- "./etc/ssl:/etc/ssl"
- "./Website:/var/www/html/public"
- "./Wiki:/var/www/html/public/wiki"
- "./etc/nginx/default.template.conf:/etc/nginx/conf.d/default.template"
ports:
- "80:80"
@@ -23,6 +24,7 @@ services:
volumes:
- "./etc/php/php.ini:/usr/local/etc/php/conf.d/php.ini"
- "./Website:/var/www/html/public"
- "./Wiki:/var/www/html/public/wiki"
myadmin:
image: phpmyadmin/phpmyadmin
container_name: phpmyadmin
@@ -35,7 +37,7 @@ services:
depends_on:
- mysqldb
mysqldb:
image: mariadb:latest
image: mariadb:${MARIADB_VERSION}
container_name: ${MYSQL_HOST}
restart: always
env_file: