hoellen/dockerfiles
1
0
Fork 0
mirror of https://github.com/hoellen/dockerfiles.git synced 2025-04-20 04:19:18 +00:00
Code Issues Projects Releases Wiki Activity

piwik: update

Browse Source
This commit is contained in:
Wonderfall 2016-09-17 15:53:34 +02:00
parent dc677cbf88
commit b2a444983c
7 changed files with 66 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
piwik/Dockerfile
View File

@ -1,14 +1,13 @@
FROM alpine:edge FROM alpine:3.4
MAINTAINER Wonderfall <wonderfall@mondedie.fr> MAINTAINER Wonderfall <wonderfall@mondedie.fr>
ARG VERSION=2.16.1 ARG VERSION=2.16.2
ARG GPG_matthieu="814E 346F A01A 20DB B04B 6807 B5DB D592 5590 A237" ARG GPG_matthieu="814E 346F A01A 20DB B04B 6807 B5DB D592 5590 A237"
ENV GID=991 UID=991 ENV UID=991 GID=991
RUN echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \
&& echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \
&& BUILD_DEPS=" \ && BUILD_DEPS=" \
git \ git \
tar \ tar \
@ -21,25 +20,24 @@ RUN echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/r
&& apk -U add \ && apk -U add \
${BUILD_DEPS} \ ${BUILD_DEPS} \
nginx \ nginx \
supervisor \ s6 \
libwebp \ su-exec \
geoip \ geoip \
tini@commuedge \ php7-fpm@commuedge \
php7-fpm@testing \ php7-gd@commuedge \
php7-gd@testing \ php7-curl@commuedge \
php7-curl@testing \ php7-session@commuedge \
php7-session@testing \ php7-json@commuedge \
php7-json@testing \ php7-ctype@commuedge \
php7-ctype@testing \ php7-mbstring@commuedge \
php7-mbstring@testing \ php7-iconv@commuedge \
php7-iconv@testing \ php7-zlib@commuedge \
php7-zlib@testing \ php7-dom@commuedge \
php7-dom@testing \ php7-openssl@commuedge \
php7-openssl@testing \ php7-mysqli@commuedge \
php7-mysqli@testing \ php7-pdo_mysql@commuedge \
php7-pdo_mysql@testing \ php7-dev@commuedge \
php7-dev@testing \ php7-pear@commuedge \
php7-pear@testing \
&& cd /tmp && git clone https://github.com/Zakay/geoip && cd geoip \ && cd /tmp && git clone https://github.com/Zakay/geoip && cd geoip \
&& phpize7 && ./configure --with-php-config=/usr/bin/php-config7 && make && make install \ && phpize7 && ./configure --with-php-config=/usr/bin/php-config7 && make && make install \
&& echo 'extension=geoip.so' >> /etc/php7/conf.d/00_geoip.ini \ && echo 'extension=geoip.so' >> /etc/php7/conf.d/00_geoip.ini \
@ -68,15 +66,16 @@ RUN echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/r
COPY nginx.conf /etc/nginx/nginx.conf COPY nginx.conf /etc/nginx/nginx.conf
COPY php-fpm.conf /etc/php7/php-fpm.conf COPY php-fpm.conf /etc/php7/php-fpm.conf
COPY supervisord.conf /usr/local/etc/supervisord.conf COPY s6.d /etc/s6.d
COPY run.sh /usr/local/bin/run.sh COPY run.sh /usr/local/bin/run.sh
RUN chmod +x /usr/local/bin/run.sh RUN chmod +x /usr/local/bin/run.sh /etc/s6.d/*/*
VOLUME /config VOLUME /config
EXPOSE 80
EXPOSE 8888
LABEL description "Open web analytics platform" \ LABEL description "Open web analytics platform" \
piwik "Piwik v${VERSION}" piwik "Piwik v${VERSION}"
CMD ["/sbin/tini","--","run.sh"] CMD ["run.sh"]

2
piwik/README.md
View File

@ -40,7 +40,7 @@ proxy_host_headers[] = HTTP_X_FORWARDED_HOST
``` ```
#### Reverse proxy #### Reverse proxy
Use port **80**. Use port **8888**.
https://github.com/Wonderfall/dockerfiles/tree/master/reverse https://github.com/Wonderfall/dockerfiles/tree/master/reverse
https://github.com/hardware/mailserver/wiki/Reverse-proxy-configuration https://github.com/hardware/mailserver/wiki/Reverse-proxy-configuration

13
piwik/nginx.conf
View File

@ -1,6 +1,5 @@
user piwik;
worker_processes auto; worker_processes auto;
pid /var/run/nginx.pid; pid /tmp/nginx.pid;
daemon off; daemon off;
events { events {
@ -15,7 +14,11 @@ http {
access_log off; access_log off;
error_log /var/log/nginx/error.log error; error_log /var/log/nginx/error.log error;
fastcgi_temp_path /tmp 1 2; fastcgi_temp_path /tmp/fastcgi 1 2;
client_body_temp_path /tmp/client_body 1 2;
proxy_temp_path /tmp/proxy 1 2;
uwsgi_temp_path /tmp/uwsgi 1 2;
scgi_temp_path /tmp/scgi 1 2;
sendfile on; sendfile on;
keepalive_timeout 15; keepalive_timeout 15;
@ -49,7 +52,7 @@ http {
image/svg+xml; image/svg+xml;
server { server {
listen 80; listen 8888;
root /piwik; root /piwik;
index index.php index.html; index index.php index.html;
@ -89,7 +92,7 @@ http {
location ~ \.php$ { location ~ \.php$ {
fastcgi_index index.php; fastcgi_index index.php;
fastcgi_pass unix:/var/run/php-fpm.sock; fastcgi_pass unix:/tmp/php-fpm.sock;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
include /etc/nginx/fastcgi_params; include /etc/nginx/fastcgi_params;
} }

6
piwik/php-fpm.conf
View File

@ -2,11 +2,7 @@
daemonize = no daemonize = no
[www] [www]
user = piwik listen = /tmp/php-fpm.sock
group = piwik
listen = /var/run/php-fpm.sock
listen.owner = piwik
listen.group = piwik
pm = dynamic pm = dynamic
pm.max_children = 5 pm.max_children = 5
pm.start_servers = 2 pm.start_servers = 2

11
piwik/run.sh
View File

@ -1,12 +1,9 @@
#!/bin/sh #!/bin/sh
addgroup -g ${GID} piwik && adduser -h /piwik -s /bin/sh -D -G piwik -u ${UID} piwik
if [ -f /piwik/config/config.ini.php ] && [ ! -f /config/config.ini.php ]; then if [ ! -f /config/config.ini.php ]; then
cp /piwik/config/config.ini.php /config/config.ini.php cp /piwik/config/config.ini.php /config/config.ini.php
elif [ -f /config/config.ini.php ]; then
mv /piwik/config/config.ini.php /config/config.ini.php.bkp
cp /config/config.ini.php /piwik/config/config.ini.php
fi fi
chown -R piwik:piwik /piwik /config /var/run/php-fpm.sock /var/lib/nginx /tmp ln -s /config/config.ini.php /piwik/config/config.ini.php
exec supervisord -c /usr/local/etc/supervisord.conf chown -R $UID:$GID /piwik /config /var/log /etc/nginx /etc/php7 /var/lib/nginx /tmp /etc/s6.d
exec su-exec $UID:$GID /bin/s6-svscan /etc/s6.d

2
piwik/s6.d/nginx/run Normal file
View File

@ -0,0 +1,2 @@
#!/bin/sh
exec nginx

2
piwik/s6.d/php/run Normal file
View File

@ -0,0 +1,2 @@
#!/bin/sh
exec php-fpm7