diff --git a/docker-compose.yml b/docker-compose.yml index c70d317..1f8e5f5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,7 @@ networks: services: mariadb: restart: always - image: mariadb:10.5.8-focal + image: mariadb:10-focal networks: - halonet volumes: @@ -41,7 +41,7 @@ services: - DEV=true nginx: - image: nginx:1.19.4-alpine + image: nginx:1-alpine depends_on: - hb networks: diff --git a/nginx.conf b/nginx.conf index f50c647..5df62c8 100644 --- a/nginx.conf +++ b/nginx.conf @@ -4,13 +4,16 @@ server { root /usr/src/hb-main/htdocs; location / { - try_files $uri $uri?$query_string /index.php?$query_string; + index index.php; + try_files $uri $uri/ /index.php; } location ~* \.php$ { include fastcgi_params; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param SCRIPT_NAME $fastcgi_script_name; + fastcgi_param HTTP_HOST $server_name; + fastcgi_param REMOTE_ADDR $remote_addr; fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_index index.php; fastcgi_pass hb:9000;