andrew
/
build-grav
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Apache updates

This commit is contained in:
Andrei Condurachi 2020-11-20 16:44:00 +02:00
parent ca6be9b072
commit 2687a23a8e
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Dockerfile
View File

@ -31,9 +31,6 @@ RUN sed -i 's/LoadModule mpm_prefork_module/#LoadModule mpm_prefork_module/g' /e
COPY vhost.conf /etc/apache2/conf.d/vhost.conf COPY vhost.conf /etc/apache2/conf.d/vhost.conf
ENV APACHE_UID 100
ENV APACHE_GID 101
# Define Grav specific version of Grav or use latest stable # Define Grav specific version of Grav or use latest stable
ENV GRAV_VERSION latest ENV GRAV_VERSION latest
@ -56,7 +53,7 @@ USER root
# provide container inside image for data persistence # provide container inside image for data persistence
VOLUME ["/var/www"] VOLUME ["/var/www"]
COPY run.sh /run.sh COPY run.sh /run.sh
RUN chmod u+x /run.sh RUN chmod u+x /run.sh
CMD ["/run.sh"] CMD ["/run.sh"]

2
run.sh
View File

@ -1,3 +1,3 @@
#!/bin/sh #!/bin/sh
exec /usr/sbin/httpd -DFOREGROUND; service httpd start

6
vhost.conf
View File

@ -10,7 +10,7 @@ ServerName localhost
AccessFileName .htaccess.local .htaccess AccessFileName .htaccess.local .htaccess
## PHP-FPM connection ## PHP-FPM connection
ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://php:9000/var/www/html/$1 ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000/var/www/html/$1
DirectoryIndex index.php DirectoryIndex index.php
## Directories, ## Directories,
@ -32,11 +32,11 @@ ServerName localhost
Require all granted Require all granted
<FilesMatch ".+(\.php)$"> <FilesMatch ".+(\.php)$">
SetHandler "proxy:fcgi://php:9000" SetHandler "proxy:fcgi://127.0.0.1:9000"
</FilesMatch> </FilesMatch>
</Directory> </Directory>
<Proxy "fcgi://php:9000"> <Proxy "fcgi://127.0.0.1:9000">
ProxySet timeout=1200 ProxySet timeout=1200
</Proxy> </Proxy>