diff --git a/docker-compose.yml b/docker-compose.yml index 3ee131e..fb933a1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,14 +14,16 @@ services: MYSQL_USER: ${MYSQL_USER} MYSQL_PASSWORD: ${MYSQL_PASSWORD} - nginx: - image: nginx:1.13.8 + apache2: + image: webdevops/apache:latest + args: + - PHP_SOCKET=php:9000 + volumes: + - ./:/var/www/html ports: - 80:80 - volumes: - - ./:/srv/www/api - - ./docker/nginx/default.conf:/etc/nginx/conf.d/default.conf - depends_on: + - 443:443 + links: - php mysql: diff --git a/docker/nginx/default.conf b/docker/nginx/default.conf deleted file mode 100644 index 99875bb..0000000 --- a/docker/nginx/default.conf +++ /dev/null @@ -1,20 +0,0 @@ -server { - listen 80 default_server; - - server_name api.com www.api.com; - - root /srv/www/api; - - location ~ \.php$ { - try_files $uri =404; - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php:9000; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - } - - error_log /var/log/nginx/api_error.log; - access_log /var/log/nginx/api_access.log; -} diff --git a/docker/php/www.conf b/docker/php/www.conf index 19ef1dc..4fe73b9 100644 --- a/docker/php/www.conf +++ b/docker/php/www.conf @@ -3,7 +3,7 @@ user = www-data group = www-data -listen = nginx:9000 +listen = apache2:9000 pm = dynamic pm.max_children = 5