From f2046a5f068d73f453852762e1763181c783dc18 Mon Sep 17 00:00:00 2001
From: Ainar Garipov <a.garipov@adguard.com>
Date: Tue, 27 Jul 2021 13:12:26 +0300
Subject: [PATCH] Pull request: scripts: imp docs and ports

Merge in DNS/adguard-home from dockerfile-ports to master

Squashed commit of the following:

commit ece0295105ee4429be68a72724da457dd1e87f7f
Merge: 3c5ae853 2f661df8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Jul 27 12:31:04 2021 +0300

    Merge branch 'master' into dockerfile-ports

commit 3c5ae8538b1463c21e91289adc27ceac9012e04e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Jul 26 20:56:45 2021 +0300

    scripts: imp docs and ports
---
 scripts/make/Dockerfile | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/scripts/make/Dockerfile b/scripts/make/Dockerfile
index bb72cae0..44649721 100644
--- a/scripts/make/Dockerfile
+++ b/scripts/make/Dockerfile
@@ -33,18 +33,21 @@ COPY --chown=nobody:nogroup\
 
 RUN setcap 'cap_net_bind_service=+eip' /opt/adguardhome/AdGuardHome
 
-# 53     : DNS
-# 67, 68 : DHCP
-# 80     : HTTP
-# 443    : HTTPS, DNS-over-HTTPS, DNSCrypt
-# 853    : DNS-over-TLS
-# 3000   : HTTP alt
-# 3001   : HTTP beta
-# 5443   : DNSCrypt alt
-# 6060   : HTTP pprof
-# 8853   : DNS-over-QUIC
-EXPOSE 53/tcp 53/udp 67/udp 68/udp 80/tcp 443/tcp 443/udp 853/tcp\
-	3000/tcp 3001/tcp 5443/tcp 5443/udp 6060/tcp 8853/udp
+# 53     : TCP, UDP : DNS
+# 67     :      UDP : DHCP (server)
+# 68     :      UDP : DHCP (client)
+# 80     : TCP      : HTTP (main)
+# 443    : TCP, UDP : HTTPS, DNS-over-HTTPS (incl. HTTP/3), DNSCrypt (main)
+# 784    :      UDP : DNS-over-QUIC (experimental)
+# 853    : TCP, UDP : DNS-over-TLS, DNS-over-QUIC
+# 3000   : TCP, UDP : HTTP(S) (alt, incl. HTTP/3)
+# 3001   : TCP, UDP : HTTP(S) (beta, incl. HTTP/3)
+# 5443   : TCP, UDP : DNSCrypt (alt)
+# 6060   : TCP      : HTTP (pprof)
+# 8853   :      UDP : DNS-over-QUIC (experimental)
+EXPOSE 53/tcp 53/udp 67/udp 68/udp 80/tcp 443/tcp 443/udp 784/udp\
+	853/tcp 853/udp 3000/tcp 3000/udp 3001/tcp 3001/udp 5443/tcp\
+	5443/udp 6060/tcp 8853/udp
 
 WORKDIR /opt/adguardhome/work