7x31/mailcow-dockerized
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PHP-FPM] Include more modules for upcoming features and Nextcloud support, drop ro flag; [Watchdog] Some fixes and changes

Browse Source
This commit is contained in:
andryyy
2017-10-08 22:47:52 +02:00
parent 7db5877644
commit 72995ff98e
4 changed files with 40 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
data/Dockerfiles/phpfpm/Dockerfile
View File

@@ -1,8 +1,16 @@
FROM php:7.1-fpm-alpine
LABEL maintainer "Andre Peters <andre.peters@servercow.de>"
ENV REDIS_PECL 3.1.4
ENV MEMCACHED_PECL 3.0.3
ENV APCU_PECL 5.1.8
RUN apk add -U --no-cache libxml2-dev \
icu-dev \
imap-dev \
libmemcached-dev \
cyrus-sasl-dev \
pcre-dev \
icu-libs \
redis \
mysql-client \
@@ -11,13 +19,33 @@ RUN apk add -U --no-cache libxml2-dev \
g++ \
make \
openssl \
&& pecl install redis \
openssl-dev \
samba-client \
libpng \
libpng-dev \
libjpeg-turbo-dev \
libwebp-dev \
zlib-dev \
libxpm-dev \
c-client \
&& pecl install redis-${REDIS_PECL} memcached-${MEMCACHED_PECL} APCu-${APCU_PECL} \
&& docker-php-ext-enable redis apcu memcached \
&& pecl clear-cache \
&& docker-php-ext-configure intl \
&& docker-php-ext-install intl pdo pdo_mysql xmlrpc \
&& docker-php-ext-enable redis \
&& pear install channel://pear.php.net/Net_IDNA2-0.1.1 Auth_SASL Net_IMAP NET_SMTP Net_IDNA2 Mail_mime \
&& apk del autoconf g++ make libxml2-dev icu-dev
&& docker-php-ext-install intl pdo pdo_mysql xmlrpc gd zip pcntl opcache \
&& docker-php-ext-configure imap --with-imap --with-imap-ssl \
&& docker-php-ext-install imap \
&& pear install channel://pear.php.net/Net_IDNA2-0.1.1 Auth_SASL2 Net_IMAP NET_SMTP Net_IDNA2 Mail_mime \
&& apk del autoconf g++ make libxml2-dev icu-dev imap-dev openssl-dev cyrus-sasl-dev pcre-dev libpng-dev libpng-dev libjpeg-turbo-dev libwebp-dev zlib-dev \
&& { \
echo 'opcache.enable=1'; \
echo 'opcache.enable_cli=1'; \
echo 'opcache.interned_strings_buffer=8'; \
echo 'opcache.max_accelerated_files=10000'; \
echo 'opcache.memory_consumption=128'; \
echo 'opcache.save_comments=1'; \
echo 'opcache.revalidate_freq=1'; \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
COPY ./docker-entrypoint.sh /

12
data/Dockerfiles/phpfpm/docker-entrypoint.sh
View File

@@ -82,16 +82,4 @@ if [[ ! -z ${DOMAIN_ARRAY} ]]; then
done
fi
# Socket access
DOCKER_SOCKET=/var/run/docker.sock
DOCKER_GROUP=docker
REGULAR_USER=www-data
if [ -S ${DOCKER_SOCKET} ]; then
DOCKER_GID=$(stat -c '%g' ${DOCKER_SOCKET})
delgroup $(stat -c '%G' ${DOCKER_SOCKET})
addgroup -g ${DOCKER_GID} ${DOCKER_GROUP}
adduser ${REGULAR_USER} ${DOCKER_GROUP}
fi
exec "$@"