diff --git a/Dockerfile b/Dockerfile index e9c481a..e577ef4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 -ENV APACHE_UID 100 -ENV APACHE_GID 101 - # Define Grav specific version of Grav or use latest stable ENV GRAV_VERSION latest @@ -56,7 +53,7 @@ USER root # provide container inside image for data persistence VOLUME ["/var/www"] -COPY run.sh /run.sh -RUN chmod u+x /run.sh +COPY run.sh /run.sh +RUN chmod u+x /run.sh -CMD ["/run.sh"] \ No newline at end of file +CMD ["/run.sh"] \ No newline at end of file diff --git a/run.sh b/run.sh index 484ed6b..213dc7a 100644 --- a/run.sh +++ b/run.sh @@ -1,3 +1,3 @@ #!/bin/sh -exec /usr/sbin/httpd -DFOREGROUND; \ No newline at end of file +service httpd start \ No newline at end of file diff --git a/vhost.conf b/vhost.conf index 26434bc..29e2ca2 100644 --- a/vhost.conf +++ b/vhost.conf @@ -10,7 +10,7 @@ ServerName localhost AccessFileName .htaccess.local .htaccess ## 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 ## Directories, @@ -32,11 +32,11 @@ ServerName localhost Require all granted - SetHandler "proxy:fcgi://php:9000" + SetHandler "proxy:fcgi://127.0.0.1:9000" - + ProxySet timeout=1200