diff --git a/Dockerfile b/Dockerfile index 3fc3a83..bf69d52 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,9 +5,6 @@ WORKDIR / ARG RELEASE_VERSION -# So that OpenRC works properly -VOLUME [ “/sys/fs/cgroup” ] - # Copying in startup script COPY /entrypoint.sh / @@ -21,7 +18,8 @@ RUN apk update && apk add --no-cache\ openrc \ php7-fpm \ php7-gd \ - && rm /etc/nginx/conf.d/default.conf + && rm /etc/nginx/conf.d/default.conf \ + && touch /run/openrc/softlevel # Adding DokuWiki RUN rm -rf /var/www/* \ diff --git a/etc/nginx/conf.d/DokuWiki.conf b/etc/nginx/conf.d/DokuWiki.conf index 921a7e2..76d26b1 100644 --- a/etc/nginx/conf.d/DokuWiki.conf +++ b/etc/nginx/conf.d/DokuWiki.conf @@ -34,10 +34,10 @@ server { location ~ \.php$ { try_files $uri $uri/ /doku.php; - include fastcgi_params; + include fastcgi.conf; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param REDIRECT_STATUS 200; - fastcgi_pass unix:/var/run/php/php7.0-fpm.sock; - # fastcgi_pass unix:/var/run/php5-fpm.sock; #old php version + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; } }