diff --git a/docker-compose.yml b/docker-compose.yml index 5e00d0a..570b7a3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,19 +4,24 @@ services: web: image: nginx:latest ports: - - "8080:80" + - "80:80" volumes: - - ./webroot:/webroot - - ./resources/nginx/default.conf:/etc/nginx/conf.d/default.conf - - ./resources/nginx/nginx.conf:/etc/nginx/nginx.conf - - ./log/nginx:/var/log/nginx - links: - - php + - ./webroot:/webroot:ro + - ./resources/nginx/default.conf:/etc/nginx/conf.d/default.conf:ro + - ./resources/nginx/nginx.conf:/etc/nginx/nginx.conf:ro + networks: + - backend restart: always php: build: ./php/ volumes: - - ./webroot:/webroot - - ./resources/php/custom.ini:/usr/local/etc/php/conf.d/custom.ini + - ./webroot:/webroot:ro + - ./resources/php/custom.ini:/usr/local/etc/php/conf.d/custom.ini:ro + networks: + - backend restart: always + +networks: + backend: + driver: bridge diff --git a/php/Dockerfile b/php/Dockerfile index 01bd195..856653d 100644 --- a/php/Dockerfile +++ b/php/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.2-fpm +FROM php:7.3-fpm MAINTAINER Aymeric Sorek "aymericsorek@protonmail.com" diff --git a/resources/nginx/default.conf b/resources/nginx/default.conf index ab2db18..383d38d 100644 --- a/resources/nginx/default.conf +++ b/resources/nginx/default.conf @@ -4,9 +4,6 @@ server { index index.php; server_name localhost; - error_log /var/log/nginx/error.log; - access_log /var/log/nginx/access.log; - root /webroot; location ~ \.php$ { diff --git a/resources/nginx/nginx.conf b/resources/nginx/nginx.conf index 466000e..5f48b6b 100644 --- a/resources/nginx/nginx.conf +++ b/resources/nginx/nginx.conf @@ -23,22 +23,6 @@ http { include /etc/nginx/mime.types; default_type application/octet-stream; - ## - # Headers - ## - - add_header X-Frame-Options DENY; - add_header X-Content-Type-Options nosniff; - add_header X-XSS-Protection "1; mode=block"; - - - ## - # Logging Settings - ## - - access_log /var/log/nginx/access.log; - error_log /var/log/nginx/error.log; - ## # Gzip Settings ## diff --git a/resources/php/custom.ini b/resources/php/custom.ini index 63f0da4..e51211a 100644 --- a/resources/php/custom.ini +++ b/resources/php/custom.ini @@ -2,7 +2,7 @@ expose_php = Off error_reporting = E_ALL display_errors = Off display_startup_errors = Off -log_errors = On +log_errors = Off error_log = /var/log/php/php_error.log ignore_repeated_errors = Off allow_url_fopen = Off diff --git a/webroot/index.php b/webroot/index.php index 60edbbb..c69239f 100644 --- a/webroot/index.php +++ b/webroot/index.php @@ -33,14 +33,14 @@

Hello admin

-

IMTLD{Y0u_H4v3_t0_st4rT_s0m3Wh3r3}

+

SPACE{y0u_H4v3_t0_St4rt_S0m3Wh3r3}