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 to PHP 7.1

Browse Source
This commit is contained in:
Wonderfall 2017-03-03 14:01:49 +01:00
parent 301376e425
commit 19da4021dd
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
piwik/Dockerfile
View File

@ -5,7 +5,7 @@ ARG GPG_matthieu="814E 346F A01A 20DB B04B 6807 B5DB D592 5590 A237"
ENV UID=991 GID=991 ENV UID=991 GID=991
RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \ RUN echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
&& BUILD_DEPS=" \ && BUILD_DEPS=" \
git \ git \
tar \ tar \
@ -22,24 +22,24 @@ RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/a
su-exec \ su-exec \
geoip \ geoip \
tzdata \ tzdata \
php7-fpm@commuedge \ php7.1-fpm@testing \
php7-gd@commuedge \ php7.1-gd@testing \
php7-curl@commuedge \ php7.1-curl@testing \
php7-session@commuedge \ php7.1-session@testing \
php7-json@commuedge \ php7.1-json@testing \
php7-ctype@commuedge \ php7.1-ctype@testing \
php7-mbstring@commuedge \ php7.1-mbstring@testing \
php7-iconv@commuedge \ php7.1-iconv@testing \
php7-zlib@commuedge \ php7.1-zlib@testing \
php7-dom@commuedge \ php7.1-dom@testing \
php7-openssl@commuedge \ php7.1-openssl@testing \
php7-mysqli@commuedge \ php7.1-mysqli@testing \
php7-pdo_mysql@commuedge \ php7.1-pdo_mysql@testing \
php7-dev@commuedge \ php7.1-dev@testing \
php7-pear@commuedge \ php7.1-pear@testing \
&& sed -i "$ s|\-n||g" /usr/bin/pecl && pecl install geoip-1.1.1 \ && sed -i "$ s|\-n||g" /usr/bin/pecl && pecl install geoip-1.1.1 \
&& echo 'extension=geoip.so' >> /etc/php7/conf.d/00_geoip.ini \ && echo 'extension=geoip.so' >> /etc/php7.1/conf.d/00_geoip.ini \
&& echo 'geoip.custom_directory=/piwik/misc' >> /etc/php7/php.ini \ && echo 'geoip.custom_directory=/piwik/misc' >> /etc/php7.1/php.ini \
&& mkdir /piwik && cd /tmp \ && mkdir /piwik && cd /tmp \
&& PIWIK_TARBALL="piwik-${VERSION}.tar.gz" \ && PIWIK_TARBALL="piwik-${VERSION}.tar.gz" \
&& wget -q https://builds.piwik.org/${PIWIK_TARBALL} \ && wget -q https://builds.piwik.org/${PIWIK_TARBALL} \
@ -56,11 +56,11 @@ RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/a
&& wget -q https://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz -P /piwik/misc \ && wget -q https://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz -P /piwik/misc \
&& gzip -d /piwik/misc/GeoLiteCity.dat.gz \ && gzip -d /piwik/misc/GeoLiteCity.dat.gz \
&& mv /piwik/misc/GeoLiteCity.dat /piwik/misc/GeoIPCity.dat \ && mv /piwik/misc/GeoLiteCity.dat /piwik/misc/GeoIPCity.dat \
&& apk del ${BUILD_DEPS} php7-dev php7-pear \ && apk del ${BUILD_DEPS} php7.1-dev php7.1-pear \
&& rm -rf /var/cache/apk/* /tmp/* /root/.gnupg && rm -rf /var/cache/apk/* /tmp/* /root/.gnupg
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.1/php-fpm.conf
COPY s6.d /etc/s6.d COPY s6.d /etc/s6.d
COPY run.sh /usr/local/bin/run.sh COPY run.sh /usr/local/bin/run.sh

2
piwik/run.sh
View File

@ -6,5 +6,5 @@ fi
ln -s /config/config.ini.php /piwik/config/config.ini.php ln -s /config/config.ini.php /piwik/config/config.ini.php
mv piwik fix && mv fix piwik # fix strange bug mv piwik fix && mv fix piwik # fix strange bug
chown -R $UID:$GID /piwik /config /var/log /etc/nginx /etc/php7 /var/lib/nginx /tmp /etc/s6.d chown -R $UID:$GID /piwik /config /var/log /etc/nginx /etc/php7.1 /var/lib/nginx /tmp /etc/s6.d
exec su-exec $UID:$GID /bin/s6-svscan /etc/s6.d exec su-exec $UID:$GID /bin/s6-svscan /etc/s6.d

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

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