From 3fa42ada8e04c79e803144632bca8923db350066 Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Thu, 27 Dec 2018 10:47:00 +0100
Subject: [PATCH] [Compose] Update to Redis 5 [Compose] New images for watchdog
 and PHP-FPM [Watchdog] Run IPv6 NAT check hourly [PHP-FPM] Update PHP and
 libs

---
 data/Dockerfiles/phpfpm/Dockerfile           | 6 +++---
 data/Dockerfiles/phpfpm/docker-entrypoint.sh | 2 +-
 data/Dockerfiles/watchdog/watchdog.sh        | 2 +-
 docker-compose.yml                           | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/data/Dockerfiles/phpfpm/Dockerfile b/data/Dockerfiles/phpfpm/Dockerfile
index eb411024..568b3daa 100644
--- a/data/Dockerfiles/phpfpm/Dockerfile
+++ b/data/Dockerfiles/phpfpm/Dockerfile
@@ -1,11 +1,11 @@
 FROM php:7.2-fpm-alpine3.8
 LABEL maintainer "Andre Peters <andre.peters@servercow.de>"
 
-ENV APCU_PECL 5.1.12
+ENV APCU_PECL 5.1.16
 ENV IMAGICK_PECL 3.4.3
 ENV MAILPARSE_PECL 3.0.2
-ENV MEMCACHED_PECL 3.0.4
-ENV REDIS_PECL 4.1.1
+ENV MEMCACHED_PECL 3.1.3
+ENV REDIS_PECL 4.2.0
 
 RUN apk add -U --no-cache autoconf \
   bash \
diff --git a/data/Dockerfiles/phpfpm/docker-entrypoint.sh b/data/Dockerfiles/phpfpm/docker-entrypoint.sh
index c54da457..e9c8aac8 100755
--- a/data/Dockerfiles/phpfpm/docker-entrypoint.sh
+++ b/data/Dockerfiles/phpfpm/docker-entrypoint.sh
@@ -27,7 +27,7 @@ CONTAINER_ID=
 # This can happen due to a broken sogo_view
 [ -s /mysql_upgrade_loop ] && SQL_LOOP_C=$(cat /mysql_upgrade_loop)
 CONTAINER_ID=$(curl --silent --insecure https://dockerapi/containers/json | jq -r ".[] | {name: .Config.Labels[\"com.docker.compose.service\"], id: .Id}" | jq -rc "select( .name | tostring | contains(\"mysql-mailcow\")) | .id")
-if [[ ! -z ${CONTAINER_ID} ]]; then
+if [[ ! -z "${CONTAINER_ID}" ]] && [[ "${CONTAINER_ID}" =~ [^a-zA-Z0-9] ]]; then
   SQL_UPGRADE_RETURN=$(curl --silent --insecure -XPOST https://dockerapi/containers/${CONTAINER_ID}/exec -d '{"cmd":"system", "task":"mysql_upgrade"}' --silent -H 'Content-type: application/json' | jq -r .type)
   if [[ ${SQL_UPGRADE_RETURN} == 'warning' ]]; then
     if [ -z ${SQL_LOOP_C} ]; then
diff --git a/data/Dockerfiles/watchdog/watchdog.sh b/data/Dockerfiles/watchdog/watchdog.sh
index c81e720f..35db514c 100755
--- a/data/Dockerfiles/watchdog/watchdog.sh
+++ b/data/Dockerfiles/watchdog/watchdog.sh
@@ -375,7 +375,7 @@ ipv6nat_checks() {
       sleep 1
     else
       diff_c=0
-      sleep $(( ( RANDOM % 30 )  + 10 ))
+      sleep 3600
     fi
   done
   return 1
diff --git a/docker-compose.yml b/docker-compose.yml
index 422efd3d..d3bba13a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -40,7 +40,7 @@ services:
             - mysql
 
     redis-mailcow:
-      image: redis:4-alpine
+      image: redis:5-alpine
       volumes:
         - redis-vol-1:/data/
       restart: always
@@ -95,7 +95,7 @@ services:
             - rspamd
 
     php-fpm-mailcow:
-      image: mailcow/phpfpm:1.27
+      image: mailcow/phpfpm:1.29
       build: ./data/Dockerfiles/phpfpm
       command: "php-fpm -d date.timezone=${TZ} -d expose_php=0"
       depends_on:
@@ -342,7 +342,7 @@ services:
         - /lib/modules:/lib/modules:ro
 
     watchdog-mailcow:
-      image: mailcow/watchdog:1.31
+      image: mailcow/watchdog:1.32
       # Debug
       #command: /watchdog.sh
       build: ./data/Dockerfiles/watchdog