mirror of
https://github.com/mailcow/mailcow-dockerized.git
synced 2025-07-20 00:01:12 -04:00
Compare commits
19 Commits
1fda71e4fa
...
8a70cdb48b
Author | SHA1 | Date | |
---|---|---|---|
|
8a70cdb48b | ||
|
99de302ec9 | ||
|
907912046f | ||
|
f1c93fa337 | ||
|
a94a29a6ac | ||
|
7e3d736ee1 | ||
|
437534556e | ||
|
ce4b9c98dc | ||
|
c134078d60 | ||
|
a8bc6aff2e | ||
|
0b627017e0 | ||
|
eb3be80286 | ||
|
87e3c91c26 | ||
|
3d8f45db43 | ||
|
115d0681a7 | ||
|
0c0ec7be58 | ||
|
8d75b570c8 | ||
|
25d6e0bbd0 | ||
|
5bf29e6ac1 |
@ -1,6 +1,6 @@
|
|||||||
FROM clamav/clamav:1.0.3_base
|
FROM clamav/clamav:1.0.3_base
|
||||||
|
|
||||||
LABEL maintainer "André Peters <andre.peters@servercow.de>"
|
LABEL maintainer "The Infrastructure Company GmbH <info@servercow.de>"
|
||||||
|
|
||||||
RUN apk upgrade --no-cache \
|
RUN apk upgrade --no-cache \
|
||||||
&& apk add --update --no-cache \
|
&& apk add --update --no-cache \
|
||||||
|
@ -6,13 +6,13 @@ ARG APCU_PECL_VERSION=5.1.22
|
|||||||
# renovate: datasource=github-tags depName=Imagick/imagick versioning=semver-coerced extractVersion=^v(?<version>.*)$
|
# renovate: datasource=github-tags depName=Imagick/imagick versioning=semver-coerced extractVersion=^v(?<version>.*)$
|
||||||
ARG IMAGICK_PECL_VERSION=3.7.0
|
ARG IMAGICK_PECL_VERSION=3.7.0
|
||||||
# renovate: datasource=github-tags depName=php/pecl-mail-mailparse versioning=semver-coerced extractVersion=^v(?<version>.*)$
|
# renovate: datasource=github-tags depName=php/pecl-mail-mailparse versioning=semver-coerced extractVersion=^v(?<version>.*)$
|
||||||
ARG MAILPARSE_PECL_VERSION=3.1.4
|
ARG MAILPARSE_PECL_VERSION=3.1.6
|
||||||
# renovate: datasource=github-tags depName=php-memcached-dev/php-memcached versioning=semver-coerced extractVersion=^v(?<version>.*)$
|
# renovate: datasource=github-tags depName=php-memcached-dev/php-memcached versioning=semver-coerced extractVersion=^v(?<version>.*)$
|
||||||
ARG MEMCACHED_PECL_VERSION=3.2.0
|
ARG MEMCACHED_PECL_VERSION=3.2.0
|
||||||
# renovate: datasource=github-tags depName=phpredis/phpredis versioning=semver-coerced extractVersion=^v(?<version>.*)$
|
# renovate: datasource=github-tags depName=phpredis/phpredis versioning=semver-coerced extractVersion=^v(?<version>.*)$
|
||||||
ARG REDIS_PECL_VERSION=5.3.7
|
ARG REDIS_PECL_VERSION=6.0.1
|
||||||
# renovate: datasource=github-tags depName=composer/composer versioning=semver-coerced extractVersion=^v(?<version>.*)$
|
# renovate: datasource=github-tags depName=composer/composer versioning=semver-coerced extractVersion=^v(?<version>.*)$
|
||||||
ARG COMPOSER_VERSION=2.5.5
|
ARG COMPOSER_VERSION=2.6.5
|
||||||
|
|
||||||
RUN apk add -U --no-cache autoconf \
|
RUN apk add -U --no-cache autoconf \
|
||||||
aspell-dev \
|
aspell-dev \
|
||||||
@ -110,4 +110,4 @@ COPY ./docker-entrypoint.sh /
|
|||||||
|
|
||||||
ENTRYPOINT ["/docker-entrypoint.sh"]
|
ENTRYPOINT ["/docker-entrypoint.sh"]
|
||||||
|
|
||||||
CMD ["php-fpm"]
|
CMD ["php-fpm"]
|
||||||
|
@ -486,7 +486,7 @@ fi
|
|||||||
# Append user overrides
|
# Append user overrides
|
||||||
echo -e "\n# User Overrides" >> /opt/postfix/conf/main.cf
|
echo -e "\n# User Overrides" >> /opt/postfix/conf/main.cf
|
||||||
touch /opt/postfix/conf/extra.cf
|
touch /opt/postfix/conf/extra.cf
|
||||||
sed -i '/myhostname/d' /opt/postfix/conf/extra.cf
|
sed -i '/\$myhostname/! { /myhostname/d }' /opt/postfix/conf/extra.cf
|
||||||
echo -e "myhostname = ${MAILCOW_HOSTNAME}\n$(cat /opt/postfix/conf/extra.cf)" > /opt/postfix/conf/extra.cf
|
echo -e "myhostname = ${MAILCOW_HOSTNAME}\n$(cat /opt/postfix/conf/extra.cf)" > /opt/postfix/conf/extra.cf
|
||||||
cat /opt/postfix/conf/extra.cf >> /opt/postfix/conf/main.cf
|
cat /opt/postfix/conf/extra.cf >> /opt/postfix/conf/main.cf
|
||||||
|
|
||||||
|
@ -18,6 +18,11 @@ EXPOSE 53/udp 53/tcp
|
|||||||
|
|
||||||
COPY docker-entrypoint.sh /docker-entrypoint.sh
|
COPY docker-entrypoint.sh /docker-entrypoint.sh
|
||||||
|
|
||||||
|
# healthcheck (nslookup)
|
||||||
|
COPY healthcheck.sh /healthcheck.sh
|
||||||
|
RUN chmod +x /healthcheck.sh
|
||||||
|
HEALTHCHECK --interval=30s --timeout=10s CMD [ "/healthcheck.sh" ]
|
||||||
|
|
||||||
ENTRYPOINT ["/docker-entrypoint.sh"]
|
ENTRYPOINT ["/docker-entrypoint.sh"]
|
||||||
|
|
||||||
CMD ["/usr/sbin/unbound"]
|
CMD ["/usr/sbin/unbound"]
|
||||||
|
12
data/Dockerfiles/unbound/healthcheck.sh
Normal file
12
data/Dockerfiles/unbound/healthcheck.sh
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
nslookup mailcow.email 127.0.0.1 1> /dev/null
|
||||||
|
|
||||||
|
if [ $? == 0 ]; then
|
||||||
|
echo "DNS resolution is working!"
|
||||||
|
exit 0
|
||||||
|
else
|
||||||
|
echo "DNS resolution is not working correctly..."
|
||||||
|
echo "Maybe check your outbound firewall, as it needs to resolve DNS over TCP AND UDP!"
|
||||||
|
exit 1
|
||||||
|
fi
|
@ -83,6 +83,7 @@
|
|||||||
//SoDebugBaseURL = YES;
|
//SoDebugBaseURL = YES;
|
||||||
//ImapDebugEnabled = YES;
|
//ImapDebugEnabled = YES;
|
||||||
//SOGoEASDebugEnabled = YES;
|
//SOGoEASDebugEnabled = YES;
|
||||||
|
SOGoEASSearchInBody = YES; // Experimental. Enabled since 2023-10
|
||||||
//LDAPDebugEnabled = YES;
|
//LDAPDebugEnabled = YES;
|
||||||
//PGDebugEnabled = YES;
|
//PGDebugEnabled = YES;
|
||||||
//MySQL4DebugEnabled = YES;
|
//MySQL4DebugEnabled = YES;
|
||||||
|
@ -97,6 +97,7 @@ $AVAILABLE_LANGUAGES = array(
|
|||||||
'lv-lv' => 'latviešu (Latvian)',
|
'lv-lv' => 'latviešu (Latvian)',
|
||||||
'nl-nl' => 'Nederlands (Dutch)',
|
'nl-nl' => 'Nederlands (Dutch)',
|
||||||
'pl-pl' => 'Język Polski (Polish)',
|
'pl-pl' => 'Język Polski (Polish)',
|
||||||
|
'pt-br' => 'Português brasileiro (Brazilian Portuguese)',
|
||||||
'pt-pt' => 'Português (Portuguese)',
|
'pt-pt' => 'Português (Portuguese)',
|
||||||
'ro-ro' => 'Română (Romanian)',
|
'ro-ro' => 'Română (Romanian)',
|
||||||
'ru-ru' => 'Pусский (Russian)',
|
'ru-ru' => 'Pусский (Russian)',
|
||||||
|
1
data/web/lang/lang.pt-br.json
Normal file
1
data/web/lang/lang.pt-br.json
Normal file
@ -0,0 +1 @@
|
|||||||
|
{}
|
@ -58,10 +58,11 @@ services:
|
|||||||
- redis
|
- redis
|
||||||
|
|
||||||
clamd-mailcow:
|
clamd-mailcow:
|
||||||
image: mailcow/clamd:1.62
|
image: mailcow/clamd:1.63
|
||||||
restart: always
|
restart: always
|
||||||
depends_on:
|
depends_on:
|
||||||
- unbound-mailcow
|
unbound-mailcow:
|
||||||
|
condition: service_healthy
|
||||||
dns:
|
dns:
|
||||||
- ${IPV4_NETWORK:-172.22.1}.254
|
- ${IPV4_NETWORK:-172.22.1}.254
|
||||||
environment:
|
environment:
|
||||||
@ -299,7 +300,10 @@ services:
|
|||||||
postfix-mailcow:
|
postfix-mailcow:
|
||||||
image: mailcow/postfix:1.72
|
image: mailcow/postfix:1.72
|
||||||
depends_on:
|
depends_on:
|
||||||
- mysql-mailcow
|
mysql-mailcow:
|
||||||
|
condition: service_started
|
||||||
|
unbound-mailcow:
|
||||||
|
condition: service_healthy
|
||||||
volumes:
|
volumes:
|
||||||
- ./data/hooks/postfix:/hooks:Z
|
- ./data/hooks/postfix:/hooks:Z
|
||||||
- ./data/conf/postfix:/opt/postfix/conf:z
|
- ./data/conf/postfix:/opt/postfix/conf:z
|
||||||
@ -390,7 +394,10 @@ services:
|
|||||||
|
|
||||||
acme-mailcow:
|
acme-mailcow:
|
||||||
depends_on:
|
depends_on:
|
||||||
- nginx-mailcow
|
nginx-mailcow:
|
||||||
|
condition: service_started
|
||||||
|
unbound-mailcow:
|
||||||
|
condition: service_healthy
|
||||||
image: mailcow/acme:1.85
|
image: mailcow/acme:1.85
|
||||||
dns:
|
dns:
|
||||||
- ${IPV4_NETWORK:-172.22.1}.254
|
- ${IPV4_NETWORK:-172.22.1}.254
|
||||||
@ -461,6 +468,13 @@ services:
|
|||||||
- postfix-vol-1:/var/spool/postfix
|
- postfix-vol-1:/var/spool/postfix
|
||||||
- ./data/assets/ssl:/etc/ssl/mail/:ro,z
|
- ./data/assets/ssl:/etc/ssl/mail/:ro,z
|
||||||
restart: always
|
restart: always
|
||||||
|
depends_on:
|
||||||
|
- postfix-mailcow
|
||||||
|
- dovecot-mailcow
|
||||||
|
- mysql-mailcow
|
||||||
|
- acme-mailcow
|
||||||
|
- redis-mailcow
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
- IPV6_NETWORK=${IPV6_NETWORK:-fd4d:6169:6c63:6f77::/64}
|
- IPV6_NETWORK=${IPV6_NETWORK:-fd4d:6169:6c63:6f77::/64}
|
||||||
- LOG_LINES=${LOG_LINES:-9999}
|
- LOG_LINES=${LOG_LINES:-9999}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user