mirror of
https://github.com/vimagick/dockerfiles.git
synced 2025-01-22 05:09:09 +02:00
update dokuwiki
This commit is contained in:
parent
ba2a7eaf73
commit
9cd79eb150
@ -8,20 +8,20 @@ MAINTAINER kev <noreply@easypi.info>
|
|||||||
WORKDIR /var/www/html
|
WORKDIR /var/www/html
|
||||||
|
|
||||||
RUN set -xe \
|
RUN set -xe \
|
||||||
&& apk add -U ca-certificates \
|
&& apk add --no-cache ca-certificates \
|
||||||
gzip \
|
gzip \
|
||||||
nginx \
|
nginx \
|
||||||
php5-fpm \
|
openssl \
|
||||||
php5-openssl \
|
php5-fpm \
|
||||||
php5-pdo_sqlite \
|
php5-openssl \
|
||||||
php5-sqlite3 \
|
php5-pdo_sqlite \
|
||||||
php5-xml \
|
php5-sqlite3 \
|
||||||
php5-zlib \
|
php5-xml \
|
||||||
tar \
|
php5-zlib \
|
||||||
|
tar \
|
||||||
&& touch /etc/php5/fpm.d/empty.conf \
|
&& touch /etc/php5/fpm.d/empty.conf \
|
||||||
&& wget -O- http://download.dokuwiki.org/src/dokuwiki/dokuwiki-stable.tgz | tar xz --strip 1 \
|
&& wget -O- http://download.dokuwiki.org/src/dokuwiki/dokuwiki-stable.tgz | tar xz --strip 1 \
|
||||||
&& chown -R nobody:nobody . \
|
&& chown -R nobody:nobody .
|
||||||
&& rm -rf /var/cache/apk/*
|
|
||||||
|
|
||||||
COPY nginx.conf /etc/nginx/nginx.conf
|
COPY nginx.conf /etc/nginx/nginx.conf
|
||||||
|
|
||||||
@ -36,4 +36,4 @@ VOLUME /var/www/html/conf \
|
|||||||
|
|
||||||
EXPOSE 80
|
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
|
WORKDIR /var/www/html
|
||||||
|
|
||||||
RUN set -xe \
|
RUN set -xe \
|
||||||
&& apk add -U ca-certificates \
|
&& apk add --no-cache ca-certificates \
|
||||||
gzip \
|
gzip \
|
||||||
nginx \
|
nginx \
|
||||||
php5-fpm \
|
openssl \
|
||||||
php5-openssl \
|
php5-fpm \
|
||||||
php5-pdo_sqlite \
|
php5-openssl \
|
||||||
php5-sqlite3 \
|
php5-pdo_sqlite \
|
||||||
php5-xml \
|
php5-sqlite3 \
|
||||||
php5-zlib \
|
php5-xml \
|
||||||
tar \
|
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 \
|
&& wget -O- http://download.dokuwiki.org/src/dokuwiki/dokuwiki-stable.tgz | tar xz --strip 1 \
|
||||||
&& chown -R nobody:nobody . \
|
&& chown -R nobody:nobody .
|
||||||
&& rm -rf /var/cache/apk/*
|
|
||||||
|
|
||||||
COPY nginx.conf /etc/nginx/nginx.conf
|
COPY nginx.conf /etc/nginx/nginx.conf
|
||||||
|
|
||||||
@ -35,4 +36,4 @@ VOLUME /var/www/html/conf \
|
|||||||
|
|
||||||
EXPOSE 80
|
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;
|
worker_processes 4;
|
||||||
|
pid /run/nginx.pid;
|
||||||
|
|
||||||
events {
|
events {
|
||||||
worker_connections 1024;
|
worker_connections 1024;
|
||||||
|
@ -1,4 +1,6 @@
|
|||||||
|
user nginx;
|
||||||
worker_processes 4;
|
worker_processes 4;
|
||||||
|
pid /run/nginx.pid;
|
||||||
|
|
||||||
events {
|
events {
|
||||||
worker_connections 1024;
|
worker_connections 1024;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
user nginx;
|
user nginx;
|
||||||
worker_processes 1;
|
worker_processes 4;
|
||||||
pid /run/nginx.pid;
|
pid /run/nginx.pid;
|
||||||
|
|
||||||
events {
|
events {
|
||||||
worker_connections 1024;
|
worker_connections 1024;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user