ci: configure servers to use IPv4 in respdiff

IPv6 isn't currently supported in our Docker image and using
it during resolution leads to a larger amount of timeouts.

diff --git a/ci/Dockerfile b/ci/Dockerfile
index 86dba2022314ae37bcb9a983e18155cf98136fc2..53c8e183893ae53d63fbc31a3ac0735e266d313a 100644 (file)
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -61,10 +61,11 @@ RUN pip3 install flake8
 
 # Unbound for respdiff
 RUN apt-get install unbound unbound-anchor -y -qqq
-RUN printf "server:\n interface: 127.0.0.1@53535\n use-syslog: yes\nremote-control:\n control-enable: no\n" >> /etc/unbound/unbound.conf
+RUN printf "server:\n interface: 127.0.0.1@53535\n use-syslog: yes\n do-ip6: no\nremote-control:\n control-enable: no\n" >> /etc/unbound/unbound.conf
 
 # BIND for respdiff
 RUN apt-get install bind9 -y -qqq
+RUN printf '\nOPTIONS="-4 $OPTIONS"' >> /etc/default/bind9
 RUN printf 'options {\n directory "/var/cache/bind";\n listen-on port 53533 { 127.0.0.1; };\n listen-on-v6 port 53533 { ::1; };\n};\n' > /etc/bind/named.conf.options
 
 # PowerDNS Recursor for Deckard CI

diff --git a/ci/respdiff/kresd.config b/ci/respdiff/kresd.config
index 98d62f17f29f7a65a7688a719899e83b48f644bd..03804358973bb42f27ad41683704f84c3b5cf2ec 100644 (file)
--- a/ci/respdiff/kresd.config
+++ b/ci/respdiff/kresd.config
@@ -1,9 +1,8 @@
 -- Refer to manual: https://knot-resolver.readthedocs.io/en/latest/daemon.html#configuration
 -- Listen on localhost and external interface
 net.listen('127.0.0.1', 5353)
-net.listen('::1', 5353)
 net.listen('127.0.0.1', 8853, { tls = true })
-net.listen('::1', 8853, { tls = true })
+net.ipv6=false
 
 -- Auto-maintain root TA
 trust_anchors.file = '.local/etc/knot-resolver/root.keys'

diff --git a/ci/respdiff/respdiff-tcp.conf b/ci/respdiff/respdiff-tcp.conf
index 3c07b6859967eebe770f8dff1dd10a6f98a8beed..6f7abb32f8982491e025faf4a978b854fe84d55e 100644 (file)
--- a/ci/respdiff/respdiff-tcp.conf
+++ b/ci/respdiff/respdiff-tcp.conf
@@ -12,7 +12,7 @@ names = kresd, bind, unbound
 # each symbolic name in [servers] section refers to config section
 # containing IP address and port of particular server
 [kresd]
-ip = ::1
+ip = 127.0.0.1
 port = 5353
 transport = tcp
 

diff --git a/ci/respdiff/respdiff-tls.conf b/ci/respdiff/respdiff-tls.conf
index 552546a653d134cd05df83b02fc3b5f5499ecf11..ba405289d2f4caeb53e5374ca07431e6dc8fd5cc 100644 (file)
--- a/ci/respdiff/respdiff-tls.conf
+++ b/ci/respdiff/respdiff-tls.conf
@@ -12,7 +12,7 @@ names = kresd, bind, unbound
 # each symbolic name in [servers] section refers to config section
 # containing IP address and port of particular server
 [kresd]
-ip = ::1
+ip = 127.0.0.1
 port = 8853
 transport = tls
 

diff --git a/ci/respdiff/respdiff-udp.conf b/ci/respdiff/respdiff-udp.conf
index 8c6e9c15c6bc7ce2bfb3a7d55a337e5bb2b5c9a5..6b8cced2c978bcca58144b5fc95a255f7c0ae549 100644 (file)
--- a/ci/respdiff/respdiff-udp.conf
+++ b/ci/respdiff/respdiff-udp.conf
@@ -12,7 +12,7 @@ names = kresd, bind, unbound
 # each symbolic name in [servers] section refers to config section
 # containing IP address and port of particular server
 [kresd]
-ip = ::1
+ip = 127.0.0.1
 port = 5353
 transport = udp