switch to knot:conf-clear image

desec-io · Jan 15, 2024 · 33fa272 · 33fa272
1 parent ddf7327
commit 33fa272
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/ns/Dockerfile b/ns/Dockerfile
@@ -1,5 +1,5 @@
 ARG DOCKER_REGISTRY
-FROM ${DOCKER_REGISTRY}cznic/knot
+FROM ${DOCKER_REGISTRY}cznic/knot:conf-clear
 # TODO fix version
 # TODO don't use Dockerfile if nothing else is done here
 

diff --git a/ns/conf/knot.conf.var b/ns/conf/knot.conf.var
@@ -1,3 +1,5 @@
+clear: !(zone)
+
 server:
     user: knot:knot
     listen: 0.0.0.0@53

diff --git a/ns/entrypoint.sh b/ns/entrypoint.sh
@@ -21,8 +21,8 @@ ls -lah /config/
 
 # TODO Consider XDP, https://www.knot-dns.cz/docs/3.3/html/operation.html#pre-requisites
 
-# Initialize config. Note: Existing configuration (storage volume) needs to be removed in order to apply new config!
-knotc conf-check || knotc conf-import -f /etc/knot/knot.conf
+# Apply config to confdb
+knotc conf-import -f /etc/knot/knot.conf +nopurge
 
 # Start knot for production
 exec knotd