diff --git a/Dockerfile b/Dockerfile index bf92c5a..ae4c04f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -# syntax=docker/dockerfile:1.2 +# syntax=docker/dockerfile:1.6 ARG BASE_IMAGE=debian:bookworm-slim # ARG BASE_IMAGE=ubuntu:jammy @@ -61,7 +61,7 @@ VOLUME [ "/var/spool/postfix", "/etc/postfix", "/etc/opendkim/keys" ] USER root WORKDIR /tmp -HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 CMD printf "EHLO healthcheck\nquit\n" | { while read l ; do sleep 1; echo $l; done } | nc 127.0.0.1 587 -w 2 | grep -qE "^220.*ESMTP Postfix" +HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --start-interval=2s --retries=3 CMD printf "EHLO healthcheck\nquit\n" | { while read l ; do sleep 1; echo $l; done } | nc -w 2 127.0.0.1 587 | grep -qE "^220.*ESMTP Postfix" EXPOSE 587 CMD [ "/bin/sh", "-c", "/scripts/run.sh" ] diff --git a/build.sh b/build.sh index 280104e..17814fc 100755 --- a/build.sh +++ b/build.sh @@ -41,5 +41,6 @@ fi # arg_list="$arg_list --platform linux/amd64,linux/arm64,linux/arm/v7" #fi -docker buildx build ${arg_list} $* . +set -x +exec docker buildx build ${arg_list} $* . diff --git a/helm/mail/values.yaml b/helm/mail/values.yaml index 2efa6a9..32b9ba9 100644 --- a/helm/mail/values.yaml +++ b/helm/mail/values.yaml @@ -211,7 +211,7 @@ readinessProbe: - -c - >- [ ! -f /tmp/container_is_terminating ] && - printf "EHLO healthcheck\n" | nc 127.0.0.1 587 | grep -qE "^220.*ESMTP Postfix" + printf "EHLO healthcheck\nquit\n" | { while read l ; do sleep 1; echo $l; done } | nc -w 2 127.0.0.1 587 | grep -qE "^220.*ESMTP Postfix" livenessProbe: initialDelaySeconds: 5 periodSeconds: 5