diff --git a/Docker/nginx/default.conf b/Docker/nginx/default.conf index 8dfc759..55bcc31 100644 --- a/Docker/nginx/default.conf +++ b/Docker/nginx/default.conf @@ -1,6 +1,6 @@ server { listen 80; - root /var/www/mathallo/web; + root /var/www/mathallo/web_main; index index.html index.php; server_name dev.mathallo.fr; diff --git a/Makefile b/Makefile index 9102a55..997e246 100644 --- a/Makefile +++ b/Makefile @@ -27,6 +27,9 @@ buildnc: buildnc_mysql: docker-compose build --no-cache --build-arg USER_UID=$(USER_UID) --build-arg USER_UNAME=$(USER_UNAME) --build-arg USER_GID=$(USER_GID) --build-arg USER_GNAME=$(USER_GNAME) mysql +buildnc_nginx: + docker-compose build --no-cache --build-arg USER_UID=$(USER_UID) --build-arg USER_UNAME=$(USER_UNAME) --build-arg USER_GID=$(USER_GID) --build-arg USER_GNAME=$(USER_GNAME) nginx + downbuildup: down build up up: @@ -80,4 +83,4 @@ exec_mysql: docker exec -it mathallo-mysql-1 bash dump_db: - docker exec mathallo-mysql-1 sh -c 'exec mysqldump -uroot -pmathallo mathallo' > ./ressources/mathallo-$(DATE_NOW)-local.sql + docker exec mathallo-mysql-1 sh -c 'exec mariadb-dump -uroot -pmathallo mathallo' > ./ressources/mathallo-$(DATE_NOW)-local.sql diff --git a/src b/src index 11a9c33..b328d0a 160000 --- a/src +++ b/src @@ -1 +1 @@ -Subproject commit 11a9c33e26b40c069be86140ed88e9944cbaa1de +Subproject commit b328d0a8b7766895f44d69ed9fb5848e1a84ba42