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

[Rspamd] Apply ratelimit against authenticated user instead of envelope from

Browse Source 
[PHP-FPM] Create PHP-FPM listeners 9001 (system) and 9002 (web), drop 9000
[Rspamd] Parse quarantine messages as utf8
[Rspamd] Use new schema for Rspamd bayes hashes and expire them in Redis
[SOGo] Change default logo
[SOGo] Use different keyserver by default in Dockerfile
[Rspamd] Add bad ASN list (disabled by default)
[Watchdog] Change the way we check PHP-FPM, change SOGo check
[Nginx] Change ports according to new PHP-FPM listeners
[Update] Fix PHP-FPM ports for existing non-mailcow Nginx sites
This commit is contained in:
André
2018-04-26 13:51:55 +02:00
parent f53006f6ab
commit 7181ee4658
15 changed files with 193 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

122
data/Dockerfiles/phpfpm/Dockerfile
View File

@@ -1,84 +1,78 @@
FROM php:7.1-fpm-alpine
FROM php:7.2-fpm-alpine3.7
LABEL maintainer "Andre Peters <andre.peters@servercow.de>"
ENV REDIS_PECL 3.1.6
ENV MEMCACHED_PECL 3.0.4
ENV APCU_PECL 5.1.9
ENV APCU_PECL 5.1.10
ENV IMAGICK_PECL 3.4.3
ENV MAILPARSE_PECL 3.0.2
ENV MEMCACHED_PECL 3.0.4
ENV REDIS_PECL 3.1.6
RUN apk add -U --no-cache libxml2-dev \
icu-dev \
imap-dev \
libmemcached-dev \
cyrus-sasl-dev \
pcre-dev \
icu-libs \
redis \
mysql-client \
bash \
autoconf \
g++ \
make \
openssl \
openssl-dev \
samba-client \
libpng \
libpng-dev \
libjpeg-turbo-dev \
libwebp-dev \
zlib-dev \
libxpm-dev \
c-client \
imagemagick-dev \
imagemagick \
libtool \
RUN apk add -U --no-cache autoconf \
bash \
c-client \
cyrus-sasl-dev \
freetype \
libpng \
libjpeg-turbo \
freetype-dev \
libpng-dev \
libjpeg-turbo-dev\
g++ \
gettext-dev \
openldap-dev \
icu-dev \
icu-libs \
imagemagick \
imagemagick-dev \
imap-dev \
libjpeg-turbo \
libjpeg-turbo-dev \
libmemcached-dev \
libpng \
libpng-dev \
libressl \
libressl-dev \
librsvg \
libtool \
libwebp-dev \
libxml2-dev \
libxpm-dev \
make \
mysql-client \
openldap-dev \
pcre-dev \
redis \
samba-client \
zlib-dev \
&& pear install channel://pear.php.net/Net_IDNA2-0.2.0 \
channel://pear.php.net/Auth_SASL-1.1.0 \
Net_IMAP \
Net_Sieve \
NET_SMTP \
Mail_mime \
&& pecl install redis-${REDIS_PECL} memcached-${MEMCACHED_PECL} APCu-${APCU_PECL} imagick-${IMAGICK_PECL} mailparse-${MAILPARSE_PECL} \
&& docker-php-ext-enable redis apcu memcached imagick mailparse \
&& pecl clear-cache \
&& docker-php-ext-configure intl \
&& pecl install redis-${REDIS_PECL} memcached-${MEMCACHED_PECL} APCu-${APCU_PECL} imagick-${IMAGICK_PECL} mailparse-${MAILPARSE_PECL} \
&& docker-php-ext-enable apcu imagick mailparse memcached redis \
&& pecl clear-cache \
&& docker-php-ext-configure intl \
&& docker-php-ext-configure gd \
--with-gd \
--enable-gd-native-ttf \
--with-freetype-dir=/usr/include/ \
--with-png-dir=/usr/include/ \
--with-jpeg-dir=/usr/include/ \
&& docker-php-ext-install -j 4 intl gettext ldap sockets soap pdo pdo_mysql xmlrpc gd zip pcntl opcache \
--with-gd \
--enable-gd-native-ttf \
--with-freetype-dir=/usr/include/ \
--with-png-dir=/usr/include/ \
--with-jpeg-dir=/usr/include/ \
&& docker-php-ext-install -j 4 gd gettext intl ldap opcache pcntl pdo pdo_mysql soap sockets xmlrpc zip \
&& docker-php-ext-configure imap --with-imap --with-imap-ssl \
&& docker-php-ext-install -j 4 imap \
&& apk del --purge 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 \
imagemagick-dev \
freetype-dev \
libpng-dev \
libjpeg-turbo-dev
&& docker-php-ext-install -j 4 imap \
&& apk del --purge autoconf \
cyrus-sasl-dev \
freetype-dev \
g++ \
icu-dev \
imagemagick-dev \
imap-dev \
libjpeg-turbo-dev \
libpng-dev \
libressl-dev \
libwebp-dev \
libxml2-dev \
make \
pcre-dev \
zlib-dev
COPY ./docker-entrypoint.sh /