diff --git a/Dockerfile b/Dockerfile index 4203e030a00ecde631c8ba63951232255489213b..b5fbd9c44b0c94396d67b8740a6f50b1db6c9238 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:jammy MAINTAINER patrick@oberdorf.net -ENV VERSION 1.17.1 +ENV VERSION 1.18.0 WORKDIR /usr/local/src/ ADD assets/sha256checksum sha256checksum diff --git a/README.md b/README.md index a9db8a59ec4ffd0b396edfebb248a339a59b636c..83aa046b547b581ba3479dcea96f32d5c433de22 100644 --- a/README.md +++ b/README.md @@ -5,12 +5,12 @@ Unbound (with DNSSEC validation) Just use this command to start the container. Unbound will listen on port 53/udp. -```docker run --name unbound -d -p 53:53/udp -p 53:53 mobilistics/unbound:1.17.1``` +```docker run --name unbound -d -p 53:53/udp -p 53:53 mobilistics/unbound:1.18.0``` (optional) If you want to override the nameserver in the unbound container, you can use: -```docker run --name unbound -d -p 53:53/udp -p 53:53 --dns="127.0.0.1" mobilistics/unbound:1.17.1``` +```docker run --name unbound -d -p 53:53/udp -p 53:53 --dns="127.0.0.1" mobilistics/unbound:1.18.0``` # Configuration These options can be set via the environment variable -e flag: @@ -37,3 +37,4 @@ These options can be set via the environment variable -e flag: - **STATISTICS_CUMULATIVE**: enable cumulative statistics, without clearing them after printing. (Default: "no", Possible Values: "yes, no") - **EXTENDED_STATISTICS**: enable extended statistics (query types, answer codes, status) printed from unbound-control. (Default: "no", Possible Values: "yes, no") - **INTERFACE**: Sets the interface to listen on useful when using --net=host (Default 0.0.0.0, Possible Values: "<ipaddress>", "<ipaddress>@<port>") +- **REMOTE_CONTROL_ENABLE**: Enable the remote control feature (Default "yes", Possible Values: "yes, no") diff --git a/assets/sha256checksum b/assets/sha256checksum index 8962bb28a3ef0fb9d06e4ac1138680db5692fdda..edc11c7dd6004124a1bd2d36d574b8f9d1163f8d 100644 --- a/assets/sha256checksum +++ b/assets/sha256checksum @@ -1 +1 @@ -ee4085cecce12584e600f3d814a28fa822dfaacec1f94c84bfd67f8a5571a5f4 unbound-1.17.1.tar.gz +3da95490a85cff6420f26fae0b84a49f5112df1bf1b7fc34f8724f02082cb712 unbound-1.18.0.tar.gz diff --git a/assets/unbound.conf b/assets/unbound.conf index 088d364a224c73e930235fbe9b3a5d5f4bb5c2f3..845264b3ea728390a4e683580458ceb7d773d899 100644 --- a/assets/unbound.conf +++ b/assets/unbound.conf @@ -593,7 +593,7 @@ python: remote-control: # Enable remote control with unbound-control(8) here. # set up the keys and certificates with unbound-control-setup. - control-enable: yes + control-enable: {{REMOTE_CONTROL_ENABLE}} # Set to no and use an absolute path as control-interface to use # a unix local named pipe for unbound-control. @@ -601,11 +601,11 @@ remote-control: # what interfaces are listened to for remote control. # give 0.0.0.0 and ::0 to listen to all interfaces. - # control-interface: 127.0.0.1 - # control-interface: ::1 + control-interface: 0.0.0.0 + control-interface: ::0 # port number for remote control operations. - # control-port: 8953 + control-port: 8953 # unbound server key file. server-key-file: "/usr/local/etc/unbound/unbound_server.key" diff --git a/docker-compose.yml b/docker-compose.yml index 8bb18e0c4057f8609d1bac2fe8057d45bf95070d..276e72ec9ad3632b061340aa9448d8c7a912b38b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,5 @@ unbound: - image: mobilistics/unbound:1.17.1 + image: mobilistics/unbound:1.18.0 ports: - "53:53/udp" - "53:53" diff --git a/start.sh b/start.sh index 85638162692251739ab7814cc1df5c6b8ea99861..6ae86a9a412f34a23d1a0a72673adadd4973be03 100644 --- a/start.sh +++ b/start.sh @@ -22,6 +22,7 @@ STATISTICS_INTERVAL=${STATISTICS_INTERVAL:-0} STATISTICS_CUMULATIVE=${STATISTICS_CUMULATIVE:-no} EXTENDED_STATISTICS=${EXTENDED_STATISTICS:-no} INTERFACE=${INTERFACE:-0.0.0.0} +REMOTE_CONTROL_ENABLE=${REMOTE_CONTROL_ENABLE:-yes} sed 's/{{DO_IPV6}}/'"${DO_IPV6}"'/' -i /usr/local/etc/unbound/unbound.conf @@ -46,5 +47,6 @@ sed 's/{{STATISTICS_INTERVAL}}/'"${STATISTICS_INTERVAL}"'/' -i /usr/local/etc/un sed 's/{{STATISTICS_CUMULATIVE}}/'"${STATISTICS_CUMULATIVE}"'/' -i /usr/local/etc/unbound/unbound.conf sed 's/{{EXTENDED_STATISTICS}}/'"${EXTENDED_STATISTICS}"'/' -i /usr/local/etc/unbound/unbound.conf sed 's/{{INTERFACE}}/'"${INTERFACE}"'/' -i /usr/local/etc/unbound/unbound.conf +sed 's/{{REMOTE_CONTROL_ENABLE}}/'"${REMOTE_CONTROL_ENABLE}"'/' -i /usr/local/etc/unbound/unbound.conf exec /usr/local/sbin/unbound -c /usr/local/etc/unbound/unbound.conf -d -v