diff --git a/core/admin/Dockerfile b/core/admin/Dockerfile index 600c3e9f..e6d70e61 100644 --- a/core/admin/Dockerfile +++ b/core/admin/Dockerfile @@ -22,7 +22,7 @@ RUN set -euxo pipefail \ RUN echo $VERSION >/version -EXPOSE 80/tcp +#EXPOSE 80/tcp HEALTHCHECK CMD curl -skfLo /dev/null http://localhost/sso/login?next=ui.index VOLUME ["/data","/dkim"] diff --git a/core/nginx/Dockerfile b/core/nginx/Dockerfile index 27757920..76c3906a 100644 --- a/core/nginx/Dockerfile +++ b/core/nginx/Dockerfile @@ -26,7 +26,8 @@ COPY *.py / RUN echo $VERSION >/version -EXPOSE 80/tcp 443/tcp 110/tcp 143/tcp 465/tcp 587/tcp 993/tcp 995/tcp 25/tcp 14190/tcp 10025/tcp 10143/tcp +EXPOSE 80/tcp 443/tcp 110/tcp 143/tcp 465/tcp 587/tcp 993/tcp 995/tcp 25/tcp +# EXPOSE 10025/tcp 10143/tcp 14190/tcp HEALTHCHECK --start-period=60s CMD curl -skfLo /dev/null http://localhost/health VOLUME ["/certs", "/overrides"] diff --git a/core/oletools/Dockerfile b/core/oletools/Dockerfile index 8bb98cd9..8526e506 100644 --- a/core/oletools/Dockerfile +++ b/core/oletools/Dockerfile @@ -14,7 +14,7 @@ RUN set -euxo pipefail \ RUN echo $VERSION >/version HEALTHCHECK --start-period=60s CMD echo PING|nc -q1 127.0.0.1 11343|grep "PONG" -EXPOSE 11343/tcp +#EXPOSE 11343/tcp USER nobody:nobody diff --git a/core/postfix/Dockerfile b/core/postfix/Dockerfile index df902dd4..8565d865 100644 --- a/core/postfix/Dockerfile +++ b/core/postfix/Dockerfile @@ -14,7 +14,7 @@ COPY start.py / RUN echo $VERSION >/version -EXPOSE 25/tcp 10025/tcp +#EXPOSE 25/tcp 10025/tcp HEALTHCHECK --start-period=350s CMD /usr/sbin/postfix status VOLUME ["/queue"] diff --git a/core/rspamd/Dockerfile b/core/rspamd/Dockerfile index eca8e62b..08ac0871 100644 --- a/core/rspamd/Dockerfile +++ b/core/rspamd/Dockerfile @@ -15,7 +15,7 @@ COPY start.py / RUN echo $VERSION >/version -EXPOSE 11332/tcp 11334/tcp 11335/tcp +#EXPOSE 11332/tcp 11334/tcp 11335/tcp HEALTHCHECK --start-period=350s CMD curl -skfLo /dev/null http://localhost:11334/ VOLUME ["/var/lib/rspamd"] diff --git a/optional/clamav/Dockerfile b/optional/clamav/Dockerfile index 9beded99..bfe02780 100644 --- a/optional/clamav/Dockerfile +++ b/optional/clamav/Dockerfile @@ -14,7 +14,7 @@ COPY start.py / RUN echo $VERSION >/version -EXPOSE 3310/tcp +#EXPOSE 3310/tcp HEALTHCHECK --start-period=350s CMD echo PING|nc localhost 3310|grep "PONG" VOLUME ["/data"] diff --git a/optional/radicale/Dockerfile b/optional/radicale/Dockerfile index 56606494..904e47db 100644 --- a/optional/radicale/Dockerfile +++ b/optional/radicale/Dockerfile @@ -10,7 +10,7 @@ COPY radicale.conf / RUN echo $VERSION >/version -EXPOSE 5232/tcp +#EXPOSE 5232/tcp HEALTHCHECK CMD curl -f -L http://localhost:5232/ || exit 1 VOLUME ["/data"] diff --git a/optional/unbound/Dockerfile b/optional/unbound/Dockerfile index 831476ab..95c63707 100644 --- a/optional/unbound/Dockerfile +++ b/optional/unbound/Dockerfile @@ -18,7 +18,7 @@ COPY start.py / RUN echo $VERSION >/version -EXPOSE 53/udp 53/tcp +#EXPOSE 53/udp 53/tcp HEALTHCHECK CMD dig @127.0.0.1 || exit 1 CMD /start.py diff --git a/webmails/Dockerfile b/webmails/Dockerfile index fb0d9090..9dc3514a 100644 --- a/webmails/Dockerfile +++ b/webmails/Dockerfile @@ -86,7 +86,7 @@ COPY php-webmail.conf /etc/php81/php-fpm.d/ COPY nginx-webmail.conf /conf/ COPY snuffleupagus.rules /etc/snuffleupagus.rules.tpl -EXPOSE 80/tcp +# EXPOSE 80/tcp VOLUME /data VOLUME /overrides