one-container: Migrated unbound to s6 supervise, update to latest pihole base image
This commit is contained in:
parent
5969c76ee1
commit
bf95961489
4 changed files with 7 additions and 9 deletions
|
@ -1,10 +1,11 @@
|
||||||
FROM pihole/pihole:2022.02.1
|
FROM pihole/pihole:2022.04.2
|
||||||
RUN apt update && apt install -y unbound
|
RUN apt update && apt install -y unbound
|
||||||
|
|
||||||
COPY lighttpd-external.conf /etc/lighttpd/external.conf
|
COPY lighttpd-external.conf /etc/lighttpd/external.conf
|
||||||
COPY unbound-pihole.conf /etc/unbound/unbound.conf.d/pi-hole.conf
|
COPY unbound-pihole.conf /etc/unbound/unbound.conf.d/pi-hole.conf
|
||||||
COPY 99-edns.conf /etc/dnsmasq.d/99-edns.conf
|
COPY 99-edns.conf /etc/dnsmasq.d/99-edns.conf
|
||||||
COPY start_unbound_and_s6_init.sh start_unbound_and_s6_init.sh
|
RUN mkdir /etc/services.d/unbound
|
||||||
|
COPY unbound-run /etc/services.d/unbound/run
|
||||||
|
|
||||||
|
ENTRYPOINT ./s6-init
|
||||||
|
|
||||||
RUN chmod +x start_unbound_and_s6_init.sh
|
|
||||||
ENTRYPOINT ./start_unbound_and_s6_init.sh
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
2022.02.1
|
2022.04.2
|
||||||
|
|
|
@ -1,3 +0,0 @@
|
||||||
#!/bin/bash -e
|
|
||||||
/etc/init.d/unbound start
|
|
||||||
/s6-init
|
|
|
@ -52,4 +52,4 @@ server:
|
||||||
private-address: 172.16.0.0/12
|
private-address: 172.16.0.0/12
|
||||||
private-address: 10.0.0.0/8
|
private-address: 10.0.0.0/8
|
||||||
private-address: fd00::/8
|
private-address: fd00::/8
|
||||||
private-address: fe80::/10
|
private-address: fe80::/10
|
||||||
|
|
Loading…
Reference in a new issue