@@ -200,6 +200,7 @@ RUN echo @testing http://nl.alpinelinux.org/alpine/edge/testing >> /etc/apk/repo
200200 sqlite-dev \
201201 libjpeg-turbo-dev \
202202 postgresql-dev && \
203+ docker-php-ext-install gd && \
203204 docker-php-ext-configure gd \
204205 --with-freetype \
205206 --with-jpeg
@@ -242,13 +243,6 @@ ADD conf/nginx-site.conf /etc/nginx/sites-available/default.conf
242243ADD conf/nginx-site-ssl.conf /etc/nginx/sites-available/default-ssl.conf
243244RUN ln -s /etc/nginx/sites-available/default.conf /etc/nginx/sites-enabled/default.conf
244245
245- # # disabled due to license changes (to fix in next release)
246- # Add GeoLite2 databases (https://dev.maxmind.com/geoip/geoip2/geolite2/)
247- # RUN curl -fSL http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.mmdb.gz -o /etc/nginx/GeoLite2-City.mmdb.gz \
248- # && curl -fSL http://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.mmdb.gz -o /etc/nginx/GeoLite2-Country.mmdb.gz \
249- # && gunzip /etc/nginx/GeoLite2-City.mmdb.gz \
250- # && gunzip /etc/nginx/GeoLite2-Country.mmdb.gz
251-
252246# tweak php-fpm config
253247RUN echo "cgi.fix_pathinfo=0" > ${php_vars} &&\
254248 echo "upload_max_filesize = 100M" >> ${php_vars} &&\
@@ -271,7 +265,11 @@ RUN echo "cgi.fix_pathinfo=0" > ${php_vars} &&\
271265 -e "s/^;clear_env = no$/clear_env = no/" \
272266 ${fpm_conf}
273267# ln -s /etc/php7/php.ini /etc/php7/conf.d/php.ini && \
274- # find /etc/php7/conf.d/ -name "*.ini" -exec sed -i -re 's/^(\s*)#(.*)/\1;\2/g' {} \;
268+ RUN cp /usr/local/etc/php/php.ini-development /usr/local/etc/php/php.ini && \
269+ sed -i \
270+ -e "s/;opcache/opcache/g" \
271+ -e "s/;zend_extension=opcache/zend_extension=opcache/g" \
272+ /usr/local/etc/php/php.ini
275273
276274
277275# Add Scripts
0 commit comments