diff --git a/README.md b/README.md index e25a44c..746f009 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ A [Docker](https://www.docker.com/what-docker) project to make a lightweight x86 ~~and ARM~~ container with [Pi-hole](https://pi-hole.net) functionality. 1) Install docker for your [x86-64 system](https://www.docker.com/community-edition) or [ARMv6l/ARMv7 system](https://www.raspberrypi.org/blog/docker-comes-to-raspberry-pi/) using those links. -2) Use the appropriate tag (x86 can use default tag, ARM users need to use images from [pihole/pihole-multiarch:debian_armhf](https://store.docker.com/community/images/pihole/pihole-multiarch/tags)) in the below `docker run` command +2) Use the appropriate tag (x86 can use default tag, ARM users need to use images from [pihole/pihole-multiarch:v4.0_armhf](https://store.docker.com/community/images/pihole/pihole-multiarch/tags)) in the below `docker run` command 3) Enjoy! [![Build Status](https://api.travis-ci.org/pihole/docker-pi-hole.svg?branch=master)](https://travis-ci.org/pihole/docker-pi-hole) [![Docker Stars](https://img.shields.io/docker/stars/pihole/pihole.svg?maxAge=604800)](https://store.docker.com/community/images/pihole/pihole) [![Docker Pulls](https://img.shields.io/docker/pulls/pihole/pihole.svg?maxAge=604800)](https://store.docker.com/community/images/pihole/pihole) @@ -99,24 +99,23 @@ The primary docker tags / versions are explained in the following table. [Click | tag | architecture | description | Dockerfile | | --- | ------------ | ----------- | ---------- | -| `debian` / `latest` | x86 | Debian x86 image, container running lighttpd and dnsmasq | [Dockerfile](https://github.com/pihole/docker-pi-hole/blob/master/debian.docker) | -| `alpine` | x86 | **Deprecated release** | | +| `latest` / `v4.0` | x86 | Debian x86 image, container running lighttpd and dnsmasq | [Dockerfile](https://github.com/pihole/docker-pi-hole/blob/master/Dockerfile_amd64) | -### `pihole/pihole:debian` [![](https://images.microbadger.com/badges/image/pihole/pihole:debian.svg)](https://microbadger.com/images/pihole/pihole "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/version/pihole/pihole:debian.svg)](https://microbadger.com/images/pihole/pihole "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/version/pihole/pihole:latest.svg)](https://microbadger.com/images/pihole/pihole "Get your own version badge on microbadger.com") +### `pihole/pihole:latest` [![](https://images.microbadger.com/badges/image/pihole/pihole:latest.svg)](https://microbadger.com/images/pihole/pihole "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/version/pihole/pihole:latest.svg)](https://microbadger.com/images/pihole/pihole "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/version/pihole/pihole:latest.svg)](https://microbadger.com/images/pihole/pihole "Get your own version badge on microbadger.com") This version of the docker aims to be as close to a standard pi-hole installation by using the recommended base OS and the exact configs and scripts (minimally modified to get them working). This enables fast updating when an update comes from pi-hole. -### `pihole/pihole-multiarch:debian_armhf` [![](https://images.microbadger.com/badges/image/pihole/pihole-multiarch:debian_armhf.svg)](https://microbadger.com/images/pihole/pihole-multiarch "Get your own image badge on microbadger.com") +### `pihole/pihole-multiarch:v4.0_armhf` [![](https://images.microbadger.com/badges/image/pihole/pihole-multiarch:v4.0_armhf.svg)](https://microbadger.com/images/pihole/pihole-multiarch "Get your own image badge on microbadger.com") Latest version of ARMv7-compatible pihole image https://hub.docker.com/r/pihole/pihole-multiarch/tags/ -### `pihole/pihole-multiarch:debian_aarch64` [![](https://images.microbadger.com/badges/image/pihole/pihole-multiarch:debian_aarch64.svg)](https://microbadger.com/images/pihole/pihole-multiarch "Get your own image badge on microbadger.com") +### `pihole/pihole-multiarch:v4.0_aarch64` [![](https://images.microbadger.com/badges/image/pihole/pihole-multiarch:v4.0_aarch64.svg)](https://microbadger.com/images/pihole/pihole-multiarch "Get your own image badge on microbadger.com") Latest version of ARM64-compatible pihole image https://hub.docker.com/r/pihole/pihole-multiarch/tags/ -### `pihole/pihole-multiarch:debian_armel` [![](https://images.microbadger.com/badges/image/pihole/pihole-multiarch:debian_armel.svg)](https://microbadger.com/images/pihole/pihole-multiarch "Get your own image badge on microbadger.com") +### `pihole/pihole-multiarch:v4.0_armel` [![](https://images.microbadger.com/badges/image/pihole/pihole-multiarch:v4.0_armel.svg)](https://microbadger.com/images/pihole/pihole-multiarch "Get your own image badge on microbadger.com") Latest version of ARMv6-compatible pihole image https://hub.docker.com/r/pihole/pihole-multiarch/tags/ @@ -152,7 +151,7 @@ We install all pihole utilities so the the built in [pihole commands](https://di The webserver and DNS service inside the container can be customized if necessary. Any configuration files you volume mount into `/etc/dnsmasq.d/` will be loaded by dnsmasq when the container starts or restarts or if you need to modify the pi-hole config it is located at `/etc/dnsmasq.d/01-pihole.conf`. The docker start scripts runs a config test prior to starting so it will tell you about any errors in the docker log. -Similarly for the webserver you can customize configs in /etc/lighttpd (*:debian* tag). +Similarly for the webserver you can customize configs in /etc/lighttpd ### Systemd init script @@ -162,11 +161,15 @@ NOTE: After initial run you may need to manually stop the docker container with ## Development +Development image tags coming soon + + # User Feedback diff --git a/traefik-docker-compose-example.md b/traefik-docker-compose-example.md index a5224fc..a76108b 100644 --- a/traefik-docker-compose-example.md +++ b/traefik-docker-compose-example.md @@ -43,7 +43,7 @@ services: container_name: pihole domainname: homedomain.lan - image: pihole/pihole:debian + image: pihole/pihole:latest ports: - '0.0.0.0:53:53/tcp' - '0.0.0.0:53:53/udp' @@ -82,8 +82,8 @@ networks: After running `docker-compose up -d` you should see this if you look at logs on traefik `docker-compose logs -f traefik` ``` -traefik | time="2018-03-07T18:57:41Z" level=debug msg="Provider event received {Status:health_status: healthy ID:33567e94e02c5adba3d47fa44c391e94fdea359fb05eecb196c95de288ffb861 From:pihole/pihole:debian Type:container Action:health_status: healthy Actor:{ID:33567e94 -e02c5adba3d47fa44c391e94fdea359fb05eecb196c95de288ffb861 Attributes:map[com.docker.compose.project:traefik image:pihole/pihole:debian traefik.frontend.priority:1 com.docker.compose.container-number:1 com.docker.compose.service:pihole com.docker.compose.version:1.19.0 name:pihole traefik.enable:true url:https://www.github.com/pihole/docker-pi-hole com.docker.compose.oneoff:False maintainer:adam@diginc.us traefik.backend:pihole traefik.frontend.rule:HostRegexp:pihole.homedomain.lan,{catchall:.*} traefik.port:80 com.docker.compose.config- +traefik | time="2018-03-07T18:57:41Z" level=debug msg="Provider event received {Status:health_status: healthy ID:33567e94e02c5adba3d47fa44c391e94fdea359fb05eecb196c95de288ffb861 From:pihole/pihole:latest Type:container Action:health_status: healthy Actor:{ID:33567e94 +e02c5adba3d47fa44c391e94fdea359fb05eecb196c95de288ffb861 Attributes:map[com.docker.compose.project:traefik image:pihole/pihole:latest traefik.frontend.priority:1 com.docker.compose.container-number:1 com.docker.compose.service:pihole com.docker.compose.version:1.19.0 name:pihole traefik.enable:true url:https://www.github.com/pihole/docker-pi-hole com.docker.compose.oneoff:False maintainer:adam@diginc.us traefik.backend:pihole traefik.frontend.rule:HostRegexp:pihole.homedomain.lan,{catchall:.*} traefik.port:80 com.docker.compose.config- hash:7551c3f4bd11766292c7dad81473ef21da91cae8666d1b04a42d1daab53fba0f]} Scope:local Time:1520449061 TimeNano:1520449061934970670}" traefik | time="2018-03-07T18:57:42Z" level=debug msg="Filtering disabled container /traefik" traefik | time="2018-03-07T18:57:42Z" level=debug msg="Could not load traefik.frontend.whitelistSourceRange labels"