From 9cd79eb150bd99ae0a1452f477f7f7a79e310177 Mon Sep 17 00:00:00 2001 From: kev Date: Mon, 4 Jul 2016 15:53:13 +0800 Subject: [PATCH] update dokuwiki --- dokuwiki/Dockerfile | 26 +++++++++++++------------- dokuwiki/arm/Dockerfile | 27 ++++++++++++++------------- dokuwiki/arm/nginx.conf | 2 ++ dokuwiki/nginx.conf | 2 ++ rtmp/server/nginx.conf | 6 +++--- 5 files changed, 34 insertions(+), 29 deletions(-) diff --git a/dokuwiki/Dockerfile b/dokuwiki/Dockerfile index 10e72fc..7f0c991 100644 --- a/dokuwiki/Dockerfile +++ b/dokuwiki/Dockerfile @@ -8,20 +8,20 @@ MAINTAINER kev 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;' diff --git a/dokuwiki/arm/Dockerfile b/dokuwiki/arm/Dockerfile index 629de29..c3cefae 100644 --- a/dokuwiki/arm/Dockerfile +++ b/dokuwiki/arm/Dockerfile @@ -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;' diff --git a/dokuwiki/arm/nginx.conf b/dokuwiki/arm/nginx.conf index 47ec5f2..d66c9cd 100644 --- a/dokuwiki/arm/nginx.conf +++ b/dokuwiki/arm/nginx.conf @@ -1,4 +1,6 @@ +user nginx; worker_processes 4; +pid /run/nginx.pid; events { worker_connections 1024; diff --git a/dokuwiki/nginx.conf b/dokuwiki/nginx.conf index 47ec5f2..d66c9cd 100644 --- a/dokuwiki/nginx.conf +++ b/dokuwiki/nginx.conf @@ -1,4 +1,6 @@ +user nginx; worker_processes 4; +pid /run/nginx.pid; events { worker_connections 1024; diff --git a/rtmp/server/nginx.conf b/rtmp/server/nginx.conf index 3a6257d..b0d5ccb 100644 --- a/rtmp/server/nginx.conf +++ b/rtmp/server/nginx.conf @@ -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;