diff --git a/one-container/docker-compose.yaml b/one-container/docker-compose.yaml index f986037..c8dccbf 100644 --- a/one-container/docker-compose.yaml +++ b/one-container/docker-compose.yaml @@ -18,15 +18,15 @@ services: # - 5335:5335/tcp # Uncomment to enable unbound access on local server # - 22/tcp # Uncomment to enable SSH environment: - ServerIP= ${ServerIP} - TZ= ${TZ} - WEBPASSWORD= ${WEBPASSWORD} - REV_SERVER= ${REV_SERVER} - REV_SERVER_TARGET= ${REV_SERVER_TARGET} - REV_SERVER_DOMAIN= ${REV_SERVER_DOMAIN} - REV_SERVER_CIDR= ${REV_SERVER_CIDR} - PIHOLE_DNS_= 127.0.0.1#5335 # Hardcoded to our Unbound server - DNSSEC= "true" # Enable DNSSEC + - ServerIP=${ServerIP} + - TZ=${TZ} + - WEBPASSWORD=${WEBPASSWORD} + - REV_SERVER=${REV_SERVER} + - REV_SERVER_TARGET=${REV_SERVER_TARGET} + - REV_SERVER_DOMAIN=${REV_SERVER_DOMAIN} + - REV_SERVER_CIDR=${REV_SERVER_CIDR} + - PIHOLE_DNS_=127.0.0.1#5335 + - DNSSEC="true" volumes: - etc_pihole-unbound:/etc/pihole:rw - etc_pihole_dnsmasq-unbound:/etc/dnsmasq.d:rw diff --git a/one-container/pihole-unbound/Dockerfile b/one-container/pihole-unbound/Dockerfile index e810670..6e378ca 100644 --- a/one-container/pihole-unbound/Dockerfile +++ b/one-container/pihole-unbound/Dockerfile @@ -1,4 +1,4 @@ -FROM pihole/pihole:2022.01.1 +FROM pihole/pihole:2022.02.1 RUN apt update && apt install -y unbound COPY lighttpd-external.conf /etc/lighttpd/external.conf diff --git a/one-container/pihole-unbound/VERSION b/one-container/pihole-unbound/VERSION index e98d28f..1f761d3 100644 --- a/one-container/pihole-unbound/VERSION +++ b/one-container/pihole-unbound/VERSION @@ -1 +1 @@ -2022.01.1 +2022.02.1 diff --git a/two-container/docker-compose.yaml b/two-container/docker-compose.yaml index 5c26cb0..c89604d 100755 --- a/two-container/docker-compose.yaml +++ b/two-container/docker-compose.yaml @@ -16,10 +16,9 @@ services: - 80/tcp - 22/tcp environment: - ServerIP: 192.168.1.5 - WEBPASSWORD: ${WEBPASSWORD} - DNS1: 192.168.1.6 - DNS2: 192.168.1.13 + - ServerIP=192.168.1.5 + - WEBPASSWORD=${WEBPASSWORD} + - PIHOLE_DNS_192.168.1.6;192.168.1.13 volumes: - /volume1/docker/pihole-unbound/pihole/volume:/etc/pihole:rw - /volume1/docker/pihole-unbound/pihole/config/hosts:/etc/hosts:ro @@ -52,4 +51,4 @@ networks: config: - subnet: 192.168.1.0/24 gateway: 192.168.1.1 - ip_range: 192.168.1.5/30 # 192.168.1.5 and 192.168.1.6 \ No newline at end of file + ip_range: 192.168.1.5/30 # 192.168.1.5 and 192.168.1.6