浏览代码

[Compose] Remove logging restrictions to make it easier to implement other drivers; Push new Postfix, SOGo and Dovecot images

andryyy 8 年之前
父节点
当前提交
99cd459655
共有 1 个文件被更改,包括 3 次插入21 次删除
  1. 3 21
      docker-compose.yml

+ 3 - 21
docker-compose.yml

@@ -96,9 +96,6 @@ services:
         - dkim-vol-1:/data/dkim
         - dkim-vol-1:/data/dkim
         - rspamd-vol-1:/var/lib/rspamd
         - rspamd-vol-1:/var/lib/rspamd
       restart: always
       restart: always
-      logging:
-        options:
-          max-size: "5m"
       dns:
       dns:
         - 172.22.1.254
         - 172.22.1.254
       dns_search: mailcow-network
       dns_search: mailcow-network
@@ -133,9 +130,6 @@ services:
         - SMTPS_PORT=${SMTPS_PORT:-465}
         - SMTPS_PORT=${SMTPS_PORT:-465}
         - SMTP_PORT=${SMTP_PORT:-25}
         - SMTP_PORT=${SMTP_PORT:-25}
       restart: always
       restart: always
-      logging:
-        options:
-          max-size: "5m"
       dns:
       dns:
         - 172.22.1.254
         - 172.22.1.254
       dns_search: mailcow-network
       dns_search: mailcow-network
@@ -145,7 +139,7 @@ services:
             - phpfpm
             - phpfpm
 
 
     sogo-mailcow:
     sogo-mailcow:
-      image: mailcow/sogo:1.2
+      image: mailcow/sogo:1.3
       build: ./data/Dockerfiles/sogo
       build: ./data/Dockerfiles/sogo
       depends_on:
       depends_on:
         unbound-mailcow:
         unbound-mailcow:
@@ -159,9 +153,6 @@ services:
       volumes:
       volumes:
         - ./data/conf/sogo/:/etc/sogo/
         - ./data/conf/sogo/:/etc/sogo/
       restart: always
       restart: always
-      logging:
-        options:
-          max-size: "5m"
       dns:
       dns:
         - 172.22.1.254
         - 172.22.1.254
       dns_search: mailcow-network
       dns_search: mailcow-network
@@ -172,7 +163,7 @@ services:
             - sogo
             - sogo
 
 
     dovecot-mailcow:
     dovecot-mailcow:
-      image: mailcow/dovecot:1.3
+      image: mailcow/dovecot:1.4
       build: ./data/Dockerfiles/dovecot
       build: ./data/Dockerfiles/dovecot
       depends_on:
       depends_on:
         unbound-mailcow:
         unbound-mailcow:
@@ -187,9 +178,6 @@ services:
         - DBNAME=${DBNAME}
         - DBNAME=${DBNAME}
         - DBUSER=${DBUSER}
         - DBUSER=${DBUSER}
         - DBPASS=${DBPASS}
         - DBPASS=${DBPASS}
-      logging:
-        options:
-          max-size: "5m"
       ports:
       ports:
         - "${DOVEADM_PORT:-127.0.0.1:19991}:12345"
         - "${DOVEADM_PORT:-127.0.0.1:19991}:12345"
         - "${IMAP_PORT:-143}:143"
         - "${IMAP_PORT:-143}:143"
@@ -208,7 +196,7 @@ services:
             - dovecot
             - dovecot
 
 
     postfix-mailcow:
     postfix-mailcow:
-      image: mailcow/postfix:1.1
+      image: mailcow/postfix:1.2
       build: ./data/Dockerfiles/postfix
       build: ./data/Dockerfiles/postfix
       depends_on:
       depends_on:
         unbound-mailcow:
         unbound-mailcow:
@@ -227,9 +215,6 @@ services:
         - "${SMTPS_PORT:-465}:465"
         - "${SMTPS_PORT:-465}:465"
         - "${SUBMISSION_PORT:-587}:587"
         - "${SUBMISSION_PORT:-587}:587"
       restart: always
       restart: always
-      logging:
-        options:
-          max-size: "5m"
       dns:
       dns:
         - 172.22.1.254
         - 172.22.1.254
       dns_search: mailcow-network
       dns_search: mailcow-network
@@ -276,9 +261,6 @@ services:
         - ./data/conf/rspamd/dynmaps:/dynmaps:ro
         - ./data/conf/rspamd/dynmaps:/dynmaps:ro
         - ./data/assets/ssl/:/etc/ssl/mail/:ro
         - ./data/assets/ssl/:/etc/ssl/mail/:ro
         - ./data/conf/nginx/:/etc/nginx/conf.d/:rw
         - ./data/conf/nginx/:/etc/nginx/conf.d/:rw
-      logging:
-        options:
-          max-size: "5m"
       ports:
       ports:
         - "${HTTPS_BIND:-0.0.0.0}:${HTTPS_PORT:-443}:${HTTPS_PORT:-443}"
         - "${HTTPS_BIND:-0.0.0.0}:${HTTPS_PORT:-443}:${HTTPS_PORT:-443}"
         - "${HTTP_BIND:-0.0.0.0}:${HTTP_PORT:-80}:${HTTP_PORT:-80}"
         - "${HTTP_BIND:-0.0.0.0}:${HTTP_PORT:-80}:${HTTP_PORT:-80}"