Skip to content

Commit

Permalink
Merge pull request #5451 from mailcow/feat/unbound-healthcheck
Browse files Browse the repository at this point in the history
[Unbound] Added Healthcheck for Unbound (Dockerfile and Compose)
  • Loading branch information
DerLinkman authored Oct 12, 2023
2 parents 1fda71e + 0b62701 commit a8bc6af
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 3 deletions.
5 changes: 5 additions & 0 deletions data/Dockerfiles/unbound/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ EXPOSE 53/udp 53/tcp

COPY docker-entrypoint.sh /docker-entrypoint.sh

# healthcheck (nslookup)
COPY healthcheck.sh /healthcheck.sh
RUN chmod +x /healthcheck.sh
HEALTHCHECK --interval=30s --timeout=10s CMD [ "/healthcheck.sh" ]

ENTRYPOINT ["/docker-entrypoint.sh"]

CMD ["/usr/sbin/unbound"]
12 changes: 12 additions & 0 deletions data/Dockerfiles/unbound/healthcheck.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/bash

nslookup mailcow.email 127.0.0.1 1> /dev/null

if [ $? == 0 ]; then
echo "DNS resolution is working!"
exit 0
else
echo "DNS resolution is not working correctly..."
echo "Maybe check your outbound firewall, as it needs to resolve DNS over TCP AND UDP!"
exit 1
fi
22 changes: 19 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,9 @@ services:
image: mailcow/clamd:1.62
restart: always
depends_on:
- unbound-mailcow
unbound-mailcow:
condition: service_healthy
restart: true
dns:
- ${IPV4_NETWORK:-172.22.1}.254
environment:
Expand Down Expand Up @@ -299,7 +301,11 @@ services:
postfix-mailcow:
image: mailcow/postfix:1.72
depends_on:
- mysql-mailcow
mysql-mailcow:
condition: service_started
unbound-mailcow:
condition: service_healthy
restart: true
volumes:
- ./data/hooks/postfix:/hooks:Z
- ./data/conf/postfix:/opt/postfix/conf:z
Expand Down Expand Up @@ -390,7 +396,10 @@ services:

acme-mailcow:
depends_on:
- nginx-mailcow
nginx-mailcow:
condition: service_started
unbound-mailcow:
condition: service_healthy
image: mailcow/acme:1.85
dns:
- ${IPV4_NETWORK:-172.22.1}.254
Expand Down Expand Up @@ -461,6 +470,13 @@ services:
- postfix-vol-1:/var/spool/postfix
- ./data/assets/ssl:/etc/ssl/mail/:ro,z
restart: always
depends_on:
- postfix-mailcow
- dovecot-mailcow
- mysql-mailcow
- acme-mailcow
- redis-mailcow

environment:
- IPV6_NETWORK=${IPV6_NETWORK:-fd4d:6169:6c63:6f77::/64}
- LOG_LINES=${LOG_LINES:-9999}
Expand Down

0 comments on commit a8bc6af

Please sign in to comment.