[#1498] Fixed failing bind9 tests

isc-projects · Sep 17, 2024 · 5ca5701 · 5ca5701
1 parent fc03f6d
commit 5ca5701
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 17 deletions.
diff --git a/docker/images/stork.Dockerfile b/docker/images/stork.Dockerfile
@@ -365,7 +365,7 @@ ENTRYPOINT ["supervisord", "-c", "/etc/supervisor/supervisord.conf"]
 EXPOSE 8080
 # Prometheus Bind9 port
 EXPOSE 9119
-HEALTHCHECK CMD [ "supervisorctl", "status" ]
+HEALTHCHECK CMD [ "supervisorctl", "-c", "/etc/supervisor/supervisord.conf", "status" ]
 # Configuration files:
 # Supervisor: /etc/supervisor/supervisord.conf
 # Stork Agent: /etc/stork
@@ -382,11 +382,8 @@ RUN mkdir -p /chroot/etc \
         && rm -rf /etc/bind \
         # Create the necessary directories.
         && mkdir -p /chroot/var/cache/bind \
-        && chown bind:bind /chroot/var/cache/bind \
         && mkdir -p /chroot/run/named \
-        && chown bind:bind /chroot/run/named \
-        && mkdir -p /chroot/usr/share \
-        && cp -R -p /usr/share/dns /chroot/usr/share
+        && chown -R bind:bind /chroot
 
 #################
 ### Packaging ###

diff --git a/tests/system/config/bind-package/named.conf b/tests/system/config/bind-package/named.conf
@@ -6,6 +6,8 @@
 //
 // If you are just adding zones, please do that in /etc/bind/named.conf.local
 
-include "/etc/bind/named.conf.options";
-include "/etc/bind/named.conf.local";
-include "/etc/bind/named.conf.default-zones";
+// These files were present in the Debian-based container,
+// but are not present in the new Alpine-based bind9 image.
+// include "/etc/bind/named.conf.options";
+// include "/etc/bind/named.conf.local";
+// include "/etc/bind/named.conf.default-zones";
diff --git a/tests/system/config/bind-rndc-custom/named.conf b/tests/system/config/bind-rndc-custom/named.conf
@@ -1,6 +1,8 @@
-include "/etc/bind/named.conf.options";
-include "/etc/bind/named.conf.local";
-include "/etc/bind/named.conf.default-zones";
+// These files were present in the Debian-based container,
+// but are not present in the new Alpine-based bind9 image.
+// include "/etc/bind/named.conf.options";
+// include "/etc/bind/named.conf.local";
+// include "/etc/bind/named.conf.default-zones";
 
 key "rndc-key" {
        algorithm hmac-sha256;

diff --git a/tests/system/config/bind-rndc/named.conf b/tests/system/config/bind-rndc/named.conf
@@ -1,7 +1,10 @@
 include "/etc/bind/rndc.key";
-include "/etc/bind/named.conf.options";
-include "/etc/bind/named.conf.local";
-include "/etc/bind/named.conf.default-zones";
+
+// These files were present in the Debian-based container,
+// but are not present in the new Alpine-based bind9 image.
+// include "/etc/bind/named.conf.options";
+// include "/etc/bind/named.conf.local";
+// include "/etc/bind/named.conf.default-zones";
 
 controls {
 	inet 127.0.0.1 allow { 127.0.0.1; } keys { "rndc-key"; };

diff --git a/tests/system/config/bind/named.conf b/tests/system/config/bind/named.conf
@@ -1,7 +1,10 @@
 include "/etc/bind/rndc.key";
-include "/etc/bind/named.conf.options";
-include "/etc/bind/named.conf.local";
-include "/etc/bind/named.conf.default-zones";
+
+// These files were present in the Debian-based container,
+// but are not present in the new Alpine-based bind9 image.
+// include "/etc/bind/named.conf.options";
+// include "/etc/bind/named.conf.local";
+// include "/etc/bind/named.conf.default-zones";
 
 controls {
 	inet 127.0.0.1 allow { localhost; };

diff --git a/tests/system/config/supervisor/named.conf b/tests/system/config/supervisor/named.conf
@@ -1,6 +1,7 @@
 [program:named]
 # The -g flag runs the daemon in the foreground and forces loggin to stderr.
 # It allows to read the BIND 9 logs with docker logs.
+directory=/etc/bind
 command=/usr/sbin/named -t /chroot -u bind -g -c /etc/bind/named.conf
 autostart = true
 autorestart = true