[PHP-FPM] Base on Alpine 3.8

[Watchdog] Base on Alpine 3.8
[ACME] Base on Alpine 3.8
[Watchdog] Minor changes
master
André 2018-10-14 14:29:03 +02:00
parent b8fe3f5fd4
commit d2d0369f32
4 changed files with 6 additions and 5 deletions

View File

@ -1,4 +1,4 @@
FROM alpine:3.6 FROM alpine:3.8
LABEL maintainer "Andre Peters <andre.peters@servercow.de>" LABEL maintainer "Andre Peters <andre.peters@servercow.de>"

View File

@ -1,4 +1,4 @@
FROM php:7.2-fpm-alpine3.7 FROM php:7.2-fpm-alpine3.8
LABEL maintainer "Andre Peters <andre.peters@servercow.de>" LABEL maintainer "Andre Peters <andre.peters@servercow.de>"
ENV APCU_PECL 5.1.12 ENV APCU_PECL 5.1.12

View File

@ -1,4 +1,4 @@
FROM alpine:3.6 FROM alpine:3.8
LABEL maintainer "André Peters <andre.peters@servercow.de>" LABEL maintainer "André Peters <andre.peters@servercow.de>"
# Installation # Installation

View File

@ -206,7 +206,7 @@ postfix_checks() {
clamd_checks() { clamd_checks() {
err_count=0 err_count=0
diff_c=0 diff_c=0
THRESHOLD=6 THRESHOLD=5
# Reduce error count by 2 after restarting an unhealthy container # Reduce error count by 2 after restarting an unhealthy container
trap "[ ${err_count} -gt 1 ] && err_count=$(( ${err_count} - 2 ))" USR1 trap "[ ${err_count} -gt 1 ] && err_count=$(( ${err_count} - 2 ))" USR1
while [ ${err_count} -lt ${THRESHOLD} ]; do while [ ${err_count} -lt ${THRESHOLD} ]; do
@ -217,7 +217,8 @@ clamd_checks() {
[ ${err_c_cur} -ne ${err_count} ] && diff_c=$(( ${err_c_cur} - ${err_count} )) [ ${err_c_cur} -ne ${err_count} ] && diff_c=$(( ${err_c_cur} - ${err_count} ))
progress "Clamd" ${THRESHOLD} $(( ${THRESHOLD} - ${err_count} )) ${diff_c} progress "Clamd" ${THRESHOLD} $(( ${THRESHOLD} - ${err_count} )) ${diff_c}
diff_c=0 diff_c=0
sleep $(( ( RANDOM % 30 ) + 10 )) # Don't check Clamd too often
sleep 1800
done done
return 1 return 1
} }