1
2
mirror of https://github.com/vimagick/dockerfiles synced 2024-06-20 13:58:42 +00:00

update dokuwiki

This commit is contained in:
kev 2016-07-04 15:53:13 +08:00
parent ba2a7eaf73
commit 9cd79eb150
5 changed files with 34 additions and 29 deletions

@ -8,20 +8,20 @@ MAINTAINER kev <noreply@easypi.info>
WORKDIR /var/www/html
RUN set -xe \
&& apk add -U ca-certificates \
gzip \
nginx \
php5-fpm \
php5-openssl \
php5-pdo_sqlite \
php5-sqlite3 \
php5-xml \
php5-zlib \
tar \
&& apk add --no-cache ca-certificates \
gzip \
nginx \
openssl \
php5-fpm \
php5-openssl \
php5-pdo_sqlite \
php5-sqlite3 \
php5-xml \
php5-zlib \
tar \
&& touch /etc/php5/fpm.d/empty.conf \
&& wget -O- http://download.dokuwiki.org/src/dokuwiki/dokuwiki-stable.tgz | tar xz --strip 1 \
&& chown -R nobody:nobody . \
&& rm -rf /var/cache/apk/*
&& chown -R nobody:nobody .
COPY nginx.conf /etc/nginx/nginx.conf
@ -36,4 +36,4 @@ VOLUME /var/www/html/conf \
EXPOSE 80
CMD mkdir -p /run/nginx && php-fpm && nginx -g 'daemon off;'
CMD php-fpm && nginx -g 'daemon off;'

@ -8,19 +8,20 @@ MAINTAINER EasyPi Software Foundation
WORKDIR /var/www/html
RUN set -xe \
&& apk add -U ca-certificates \
gzip \
nginx \
php5-fpm \
php5-openssl \
php5-pdo_sqlite \
php5-sqlite3 \
php5-xml \
php5-zlib \
tar \
&& apk add --no-cache ca-certificates \
gzip \
nginx \
openssl \
php5-fpm \
php5-openssl \
php5-pdo_sqlite \
php5-sqlite3 \
php5-xml \
php5-zlib \
tar \
&& touch /etc/php5/fpm.d/empty.conf \
&& wget -O- http://download.dokuwiki.org/src/dokuwiki/dokuwiki-stable.tgz | tar xz --strip 1 \
&& chown -R nobody:nobody . \
&& rm -rf /var/cache/apk/*
&& chown -R nobody:nobody .
COPY nginx.conf /etc/nginx/nginx.conf
@ -35,4 +36,4 @@ VOLUME /var/www/html/conf \
EXPOSE 80
CMD mkdir -p /run/nginx && php-fpm && nginx -g 'daemon off;'
CMD php-fpm && nginx -g 'daemon off;'

@ -1,4 +1,6 @@
user nginx;
worker_processes 4;
pid /run/nginx.pid;
events {
worker_connections 1024;

@ -1,4 +1,6 @@
user nginx;
worker_processes 4;
pid /run/nginx.pid;
events {
worker_connections 1024;

@ -1,6 +1,6 @@
user nginx;
worker_processes 1;
pid /run/nginx.pid;
user nginx;
worker_processes 4;
pid /run/nginx.pid;
events {
worker_connections 1024;