Dockerfile: really expose all the services

diff --git a/Dockerfile b/Dockerfile
index f49f94dd5cff655d8a959eb6edb534087aaf782b..b891405757bb6edc685057eb42ed58d88590b978 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -43,13 +43,13 @@ RUN apt-get install -y /pkg/*/*.deb && \
        rm -rf /var/lib/apt/lists/* && \
        mkdir /config
 
-COPY manager/etc/knot-resolver/config.yml /config/config.yml
+COPY manager/etc/knot-resolver/config.docker.yml /config/config.yml
 
 LABEL cz.knot-resolver.vendor="CZ.NIC"
 LABEL maintainer="knot-resolver-users@lists.nic.cz"
 
-# Export DNS over UDP & TCP, DNS-over-HTTPS, DNS-over-TLS, web interface
-EXPOSE 53/UDP 53/TCP 443/TCP 853/TCP 8453/TCP
+# Export plain DNS, DoT, DoH and management interface
+EXPOSE 53/UDP 53/TCP 443/TCP 853/TCP 5000/TCP
 
-ENTRYPOINT ["/usr/bin/python3", "-m", "knot_resolver_manager"]
+ENTRYPOINT ["/usr/bin/knot-resolver"]
 CMD ["-c", "/config/config.yml"]

diff --git a/manager/etc/knot-resolver/config.docker.yml b/manager/etc/knot-resolver/config.docker.yml
new file mode 100644 (file)
index 0000000..5c10d66
--- /dev/null
+++ b/manager/etc/knot-resolver/config.docker.yml
@@ -0,0 +1,12 @@
+workers: 2
+logging:
+  level: info
+network:
+  listen:
+    - interface: lo@53
+    - interface: lo@853
+      kind: dot
+    - interface: lo@443
+      kind: doh2
+management:
+  interface: 127.0.0.1@5000