Merge branch 'master' of github.com:diginc/docker-pi-hole into development

This commit is contained in:
Adam Hill 2018-10-15 22:11:42 -05:00
commit 710f7bff27
No known key found for this signature in database
GPG Key ID: 2193804FCA429855
2 changed files with 4 additions and 1 deletions

View File

@ -25,7 +25,7 @@ A [Docker](https://www.docker.com/what-docker) project to make a lightweight x86
One crucial thing to know before starting is this container needs port 53 and port 80, two very popular ports that may conflict with existing applications. If you have no other services or docker containers using port 53/80 (if you do, keep reading below for a reverse proxy example), the minimum arguments required to run this container are in the script [docker_run.sh](https://github.com/pi-hole/docker-pi-hole/blob/master/docker_run.sh) or summarized here:
```
```bash
IP_LOOKUP="$(ip route get 8.8.8.8 | awk '{ print $NF; exit }')" # May not work for VPN / tun0
IPv6_LOOKUP="$(ip -6 route get 2001:4860:4860::8888 | awk '{for(i=1;i<=NF;i++) if ($i=="src") print $(i+1)}')" # May not work for VPN / tun0
IP="${IP:-$IP_LOOKUP}" # use $IP, if set, otherwise IP_LOOKUP

View File

@ -2,6 +2,9 @@ version: "3"
services:
pihole:
image: pihole/pihole:latest
dns:
- 127.0.0.1
- 1.1.1.1
ports:
- "53:53/tcp"
- "53:53/udp"