William/DokuWiki-on-Docker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Still bug-fixing; using local port instead of unix sockets

Browse Source
This commit is contained in:
William Miceli
2020-01-03 19:50:53 -05:00
parent f177e82db6
commit d64585fb94
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@@ -5,9 +5,6 @@ WORKDIR /
ARG RELEASE_VERSION ARG RELEASE_VERSION
# So that OpenRC works properly
VOLUME [ “/sys/fs/cgroup” ]
# Copying in startup script # Copying in startup script
COPY /entrypoint.sh / COPY /entrypoint.sh /
@@ -21,7 +18,8 @@ RUN apk update && apk add --no-cache\
openrc \ openrc \
php7-fpm \ php7-fpm \
php7-gd \ php7-gd \
&& rm /etc/nginx/conf.d/default.conf && rm /etc/nginx/conf.d/default.conf \
&& touch /run/openrc/softlevel
# Adding DokuWiki # Adding DokuWiki
RUN rm -rf /var/www/* \ RUN rm -rf /var/www/* \

6
etc/nginx/conf.d/DokuWiki.conf
View File

@@ -34,10 +34,10 @@ server {
location ~ \.php$ { location ~ \.php$ {
try_files $uri $uri/ /doku.php; try_files $uri $uri/ /doku.php;
include fastcgi_params; include fastcgi.conf;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param REDIRECT_STATUS 200; fastcgi_param REDIRECT_STATUS 200;
fastcgi_pass unix:/var/run/php/php7.0-fpm.sock; fastcgi_pass 127.0.0.1:9000;
# fastcgi_pass unix:/var/run/php5-fpm.sock; #old php version fastcgi_index index.php;
} }
} }