mirror of
https://github.com/optim-enterprises-bv/Mailu.git
synced 2025-10-29 17:22:20 +00:00
Merge #3608
3608: Ensure healthchecks timeout r=mergify[bot] a=nextgens ## What type of PR? bug-fix ## What does this PR do? Ensure healthchecks timeout ### Related issue(s) - close #3398 - close #3602 ## Prerequisites Before we can consider review and merge, please make sure the following list is done and checked. If an entry in not applicable, you can check it or remove it from the list. - [ ] In case of feature or enhancement: documentation updated accordingly - [x] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/workflow.html#changelog) entry file. Co-authored-by: Florent Daigniere <nextgens@freenetproject.org>
This commit is contained in:
@@ -23,7 +23,7 @@ RUN set -euxo pipefail \
|
||||
RUN echo $VERSION >/version
|
||||
|
||||
#EXPOSE 8080/tcp
|
||||
HEALTHCHECK CMD curl -skfLo /dev/null http://localhost:8080/ping
|
||||
HEALTHCHECK CMD curl -m3 -skfLo /dev/null http://localhost:8080/ping
|
||||
|
||||
VOLUME ["/data","/dkim"]
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ RUN echo $VERSION >/version
|
||||
|
||||
EXPOSE 80/tcp 443/tcp 110/tcp 143/tcp 465/tcp 587/tcp 993/tcp 995/tcp 25/tcp 4190/tcp
|
||||
# EXPOSE 10025/tcp 10143/tcp 14190/tcp
|
||||
HEALTHCHECK --start-period=60s CMD curl -skfLo /dev/null http://127.0.0.1:10204/health && kill -0 `cat /run/dovecot/master.pid`
|
||||
HEALTHCHECK --start-period=60s CMD curl -m3 -skfLo /dev/null http://127.0.0.1:10204/health && kill -0 `cat /run/dovecot/master.pid`
|
||||
|
||||
VOLUME ["/certs", "/overrides"]
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ COPY start.py /
|
||||
RUN echo $VERSION >/version
|
||||
|
||||
#EXPOSE 11332/tcp 11334/tcp 11335/tcp
|
||||
HEALTHCHECK --start-period=350s CMD curl -skfLo /dev/null http://localhost:11334/
|
||||
HEALTHCHECK --start-period=350s CMD curl -m3 -skfLo /dev/null http://localhost:11334/
|
||||
|
||||
VOLUME ["/var/lib/rspamd"]
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ COPY main.py ./main.py
|
||||
RUN echo $VERSION >> /version
|
||||
|
||||
EXPOSE 80/tcp
|
||||
HEALTHCHECK --start-period=350s CMD curl -skfLo /dev/null http://localhost/
|
||||
HEALTHCHECK --start-period=350s CMD curl -m3 -skfLo /dev/null http://localhost/
|
||||
USER mailu
|
||||
|
||||
CMD gunicorn -w 4 -b :80 --access-logfile - --error-logfile - --preload main:app
|
||||
|
||||
@@ -1 +1,2 @@
|
||||
Disable HARDENED_MALLOC unless the requirements are met
|
||||
Ensure the healthchecks timeout
|
||||
|
||||
@@ -94,6 +94,6 @@ VOLUME /overrides
|
||||
|
||||
CMD /start.py
|
||||
|
||||
HEALTHCHECK CMD curl -f -L http://localhost/ping || exit 1
|
||||
HEALTHCHECK CMD curl -m3 -f -L http://localhost/ping || exit 1
|
||||
|
||||
RUN echo $VERSION >> /version
|
||||
|
||||
Reference in New Issue
Block a user