esoko/mapguesser
esoko/mapguesser
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 18 Wiki Activity

Merged in feature/MAPG-92-use-nginx-instead-of-apache-in-docker (pull request #71)

Browse Source 
MAPG-92 use Nginx instead of Apache in Docker environment
This commit is contained in:
Bence Pőcze 2020-05-31 12:47:59 +00:00
commit 7a924c5257
3 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docker/Dockerfile
View File

@ -2,16 +2,14 @@ FROM ubuntu:focal
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
# Install Apache, PHP and further necessary packages # Install Nginx, PHP and further necessary packages
RUN apt update RUN apt update --fix-missing
RUN apt install -y curl git mariadb-client apache2 \ RUN apt install -y curl git mariadb-client nginx \
php-apcu php-xdebug php7.4-cli php7.4-curl php7.4-fpm php7.4-mbstring php7.4-mysql php7.4-zip php-apcu php-xdebug php7.4-cli php7.4-curl php7.4-fpm php7.4-mbstring php7.4-mysql php7.4-zip
# Configure Apache with PHP # Configure Nginx with PHP
RUN mkdir -p /run/php RUN mkdir -p /run/php
RUN a2enmod proxy_fcgi rewrite COPY configs/nginx.conf /etc/nginx/sites-available/default
RUN a2enconf php7.4-fpm
COPY configs/apache.conf /etc/apache2/sites-available/000-default.conf
RUN echo "xdebug.remote_enable = 1" >> /etc/php/7.4/mods-available/xdebug.ini RUN echo "xdebug.remote_enable = 1" >> /etc/php/7.4/mods-available/xdebug.ini
RUN echo "xdebug.remote_autostart = 1" >> /etc/php/7.4/mods-available/xdebug.ini RUN echo "xdebug.remote_autostart = 1" >> /etc/php/7.4/mods-available/xdebug.ini
RUN echo "xdebug.remote_connect_back = 1" >> /etc/php/7.4/mods-available/xdebug.ini RUN echo "xdebug.remote_connect_back = 1" >> /etc/php/7.4/mods-available/xdebug.ini
@ -29,4 +27,4 @@ EXPOSE 80
VOLUME /var/www/mapguesser VOLUME /var/www/mapguesser
WORKDIR /var/www/mapguesser WORKDIR /var/www/mapguesser
ENTRYPOINT /usr/sbin/php-fpm7.4 -F & /usr/sbin/apache2ctl -DFOREGROUND ENTRYPOINT /usr/sbin/php-fpm7.4 -F & /usr/sbin/nginx -g 'daemon off;'

15
docker/configs/apache.conf
View File

@ -1,15 +0,0 @@
<VirtualHost *:80>
ServerName mapguesser-dev.ch
ServerAdmin webmaster@localhost
DocumentRoot /var/www/mapguesser/public
ErrorLog ${APACHE_LOG_DIR}/error.log
CustomLog ${APACHE_LOG_DIR}/access.log combined
</VirtualHost>
<Directory /var/www/mapguesser/public>
Options FollowSymLinks
AllowOverride All
Require all granted
</Directory>

23
docker/configs/nginx.conf Normal file
View File

@ -0,0 +1,23 @@
server {
listen 80 default_server;
listen [::]:80 default_server;
root /var/www/mapguesser/public;
index index.php index.html index.htm index.nginx-debian.html;
server_name mapguesser-dev.ch;
location / {
try_files $uri $uri/ /index.php?$args;
}
location ~ \.php$ {
include snippets/fastcgi-php.conf;
fastcgi_pass unix:/var/run/php/php7.4-fpm.sock;
}
location ~ /\.ht {
deny all;
}
}