Browse Source

[Compose] New images, add TZ variable for ACME and PHP-FPM

André 7 years ago
parent
commit
375f91cbd2
1 changed files with 7 additions and 5 deletions
  1. 7 5
      docker-compose.yml

+ 7 - 5
docker-compose.yml

@@ -59,7 +59,7 @@ services:
             - redis
             - redis
 
 
     clamd-mailcow:
     clamd-mailcow:
-      image: mailcow/clamd:1.11
+      image: mailcow/clamd:1.12
       build: ./data/Dockerfiles/clamd
       build: ./data/Dockerfiles/clamd
       restart: always
       restart: always
       tty: true
       tty: true
@@ -104,7 +104,7 @@ services:
             - rspamd
             - rspamd
 
 
     php-fpm-mailcow:
     php-fpm-mailcow:
-      image: mailcow/phpfpm:1.16
+      image: mailcow/phpfpm:1.17
       build: ./data/Dockerfiles/phpfpm
       build: ./data/Dockerfiles/phpfpm
       command: "php-fpm -d date.timezone=${TZ} -d expose_php=0"
       command: "php-fpm -d date.timezone=${TZ} -d expose_php=0"
       depends_on:
       depends_on:
@@ -274,6 +274,7 @@ services:
         - HTTP_PORT=${HTTP_PORT:-80}
         - HTTP_PORT=${HTTP_PORT:-80}
         - MAILCOW_HOSTNAME=${MAILCOW_HOSTNAME}
         - MAILCOW_HOSTNAME=${MAILCOW_HOSTNAME}
         - IPV4_NETWORK=${IPV4_NETWORK:-172.22.1}
         - IPV4_NETWORK=${IPV4_NETWORK:-172.22.1}
+        - TZ=${TZ}
       volumes:
       volumes:
         - ./data/web:/web:ro
         - ./data/web:/web:ro
         - ./data/conf/rspamd/dynmaps:/dynmaps:ro
         - ./data/conf/rspamd/dynmaps:/dynmaps:ro
@@ -297,7 +298,7 @@ services:
       depends_on:
       depends_on:
         - nginx-mailcow
         - nginx-mailcow
         - mysql-mailcow
         - mysql-mailcow
-      image: mailcow/acme:1.31
+      image: mailcow/acme:1.32
       build: ./data/Dockerfiles/acme
       build: ./data/Dockerfiles/acme
       sysctls:
       sysctls:
         - net.ipv6.conf.all.disable_ipv6=${SYSCTL_IPV6_DISABLED:-0}
         - net.ipv6.conf.all.disable_ipv6=${SYSCTL_IPV6_DISABLED:-0}
@@ -312,6 +313,7 @@ services:
         - DBPASS=${DBPASS}
         - DBPASS=${DBPASS}
         - SKIP_LETS_ENCRYPT=${SKIP_LETS_ENCRYPT:-n}
         - SKIP_LETS_ENCRYPT=${SKIP_LETS_ENCRYPT:-n}
         - SKIP_IP_CHECK=${SKIP_IP_CHECK:-n}
         - SKIP_IP_CHECK=${SKIP_IP_CHECK:-n}
+        - TZ=${TZ}
       volumes:
       volumes:
         - ./data/web/.well-known/acme-challenge:/var/www/acme:rw
         - ./data/web/.well-known/acme-challenge:/var/www/acme:rw
         - ./data/assets/ssl:/var/lib/acme/:rw
         - ./data/assets/ssl:/var/lib/acme/:rw
@@ -345,7 +347,7 @@ services:
         - /lib/modules:/lib/modules:ro
         - /lib/modules:/lib/modules:ro
 
 
     watchdog-mailcow:
     watchdog-mailcow:
-      image: mailcow/watchdog:1.18
+      image: mailcow/watchdog:1.19
       # Debug
       # Debug
       #command: /watchdog.sh
       #command: /watchdog.sh
       build: ./data/Dockerfiles/watchdog
       build: ./data/Dockerfiles/watchdog
@@ -372,7 +374,7 @@ services:
             - watchdog
             - watchdog
 
 
     dockerapi-mailcow:
     dockerapi-mailcow:
-      image: mailcow/dockerapi:1.12
+      image: mailcow/dockerapi:1.13
       restart: always
       restart: always
       build: ./data/Dockerfiles/dockerapi
       build: ./data/Dockerfiles/dockerapi
       sysctls:
       sysctls: