mirror of
https://github.com/Retropex/btcpayserver-docker.git
synced 2025-05-12 13:00:41 +02:00
bump pihole
This commit is contained in:
nicolas.dorier
parent
732d676891
commit
b4586c1d5d
@ -359,7 +359,7 @@ Note that BTCPayServer developers will not spend excessive time testing your ima
|
||||
| btcpayserver/eps | 0.2.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.2/EPS/0.2.2/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.2/EPS/0.2.2/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.2/EPS/0.2.2/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/eps) |
|
||||
| btcpayserver/joinmarket | 0.9.10 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.10/JoinMarket/0.9.10/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.10/JoinMarket/0.9.10/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.10/JoinMarket/0.9.10/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/joinmarket) |
|
||||
| nicolasdorier/ndlc-cli | 1.0.1 | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/arm64v8.Dockerfile) | [Github](https://github.com/dgarage/ndlc) - [DockerHub](https://hub.docker.com/r/nicolasdorier/ndlc-cli) |
|
||||
| pihole/pihole | 2023.05.2 | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/2023.05.2/src/Dockerfile) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/2023.05.2/src/Dockerfile) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/2023.05.2/src/Dockerfile) | [Github](https://github.com/pi-hole/docker-pi-hole) - [DockerHub](https://hub.docker.com/r/pihole/pihole) |
|
||||
| pihole/pihole | 2025.03.0 | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/2025.03.0/src/Dockerfile) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/2025.03.0/src/Dockerfile) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/2025.03.0/src/Dockerfile) | [Github](https://github.com/pi-hole/docker-pi-hole) - [DockerHub](https://hub.docker.com/r/pihole/pihole) |
|
||||
| btcpayserver/shopify-app-deployer | 1.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/shopify-app/1.2/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/shopify-app/1.2/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/shopify-app/1.2/Dockerfile) | [Github](https://github.com/btcpayserver/shopify-app) - [DockerHub](https://hub.docker.com/r/btcpayserver/shopify-app-deployer) |
|
||||
| btcpayserver/snapdrop | 1.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Snapdrop/1.2/Snapdrop/1.2/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Snapdrop/1.2/Snapdrop/1.2/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Snapdrop/1.2/Snapdrop/1.2/Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/snapdrop) |
|
||||
| btcpayserver/tor | 0.4.8.10 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.8.10/Tor/0.4.8.10/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.8.10/Tor/0.4.8.10/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.8.10/Tor/0.4.8.10/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/tor) |
|
||||
|
||||
@ -204,7 +204,6 @@ fi
|
||||
: "${REVERSEPROXY_HTTP_PORT:=80}"
|
||||
: "${REVERSEPROXY_HTTPS_PORT:=443}"
|
||||
: "${BTCPAY_ENABLE_SSH:=false}"
|
||||
: "${PIHOLE_SERVERIP:=}"
|
||||
: "${CLOUDFLARE_TUNNEL_TOKEN:=}"
|
||||
|
||||
OLD_BTCPAY_DOCKER_COMPOSE="$BTCPAY_DOCKER_COMPOSE"
|
||||
@ -314,7 +313,6 @@ BTCPAY_IMAGE:$BTCPAY_IMAGE
|
||||
ACME_CA_URI:$ACME_CA_URI
|
||||
TOR_RELAY_NICKNAME: $TOR_RELAY_NICKNAME
|
||||
TOR_RELAY_EMAIL: $TOR_RELAY_EMAIL
|
||||
PIHOLE_SERVERIP: $PIHOLE_SERVERIP
|
||||
FIREFLY_HOST: $FIREFLY_HOST
|
||||
----------------------
|
||||
Additional exported variables:
|
||||
@ -366,7 +364,6 @@ export BTCPAY_BASE_DIRECTORY=\"$BTCPAY_BASE_DIRECTORY\"
|
||||
export BTCPAY_ENV_FILE=\"$BTCPAY_ENV_FILE\"
|
||||
export BTCPAY_HOST_SSHKEYFILE=\"$BTCPAY_HOST_SSHKEYFILE\"
|
||||
export BTCPAY_ENABLE_SSH=$BTCPAY_ENABLE_SSH
|
||||
export PIHOLE_SERVERIP=\"$PIHOLE_SERVERIP\"
|
||||
if cat \"\$BTCPAY_ENV_FILE\" &> /dev/null; then
|
||||
while IFS= read -r line; do
|
||||
! [[ \"\$line\" == \"#\"* ]] && [[ \"\$line\" == *\"=\"* ]] && export \"\$line\"
|
||||
|
||||
@ -814,18 +814,18 @@ cd - && cd ..
|
||||
|
||||
|
||||
# Build pihole
|
||||
# https://raw.githubusercontent.com/pi-hole/docker-pi-hole/2023.05.2/src/Dockerfile
|
||||
# https://raw.githubusercontent.com/pi-hole/docker-pi-hole/2025.03.0/src/Dockerfile
|
||||
DOCKERFILE="src/Dockerfile"
|
||||
# https://raw.githubusercontent.com/pi-hole/docker-pi-hole/2023.05.2/src/Dockerfile
|
||||
# https://raw.githubusercontent.com/pi-hole/docker-pi-hole/2025.03.0/src/Dockerfile
|
||||
[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="src/Dockerfile"
|
||||
# https://raw.githubusercontent.com/pi-hole/docker-pi-hole/2023.05.2/src/Dockerfile
|
||||
# https://raw.githubusercontent.com/pi-hole/docker-pi-hole/2025.03.0/src/Dockerfile
|
||||
[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="src/Dockerfile"
|
||||
echo "Building pihole/pihole:2023.05.2"
|
||||
echo "Building pihole/pihole:2025.03.0"
|
||||
git clone https://github.com/pi-hole/docker-pi-hole pihole
|
||||
cd pihole
|
||||
git checkout 2023.05.2
|
||||
git checkout 2025.03.0
|
||||
cd "$(dirname $DOCKERFILE)"
|
||||
docker build -f "$DOCKERFILE" -t "pihole/pihole:2023.05.2" .
|
||||
docker build -f "$DOCKERFILE" -t "pihole/pihole:2025.03.0" .
|
||||
cd - && cd ..
|
||||
|
||||
|
||||
|
||||
@ -3,17 +3,18 @@ services:
|
||||
pihole:
|
||||
restart: unless-stopped
|
||||
container_name: pihole
|
||||
image: pihole/pihole:2023.05.2
|
||||
image: pihole/pihole:2025.03.0
|
||||
environment:
|
||||
ServerIP: "${PIHOLE_SERVERIP:-127.0.0.1}"
|
||||
VIRTUAL_HOST: pi.hole
|
||||
VIRTUAL_HOST_NAME: "pihole"
|
||||
FTLCONF_dns_listeningMode: 'all'
|
||||
expose:
|
||||
- "53"
|
||||
- "67"
|
||||
- "80"
|
||||
- "443"
|
||||
ports:
|
||||
- "53:53/tcp"
|
||||
- "53:53/udp"
|
||||
volumes:
|
||||
- "./pihole/resolv.conf:/etc/resolv.conf:ro"
|
||||
|
||||
@ -26,12 +26,6 @@ From now everytime a device will connect to your local network, they will automa
|
||||
## Using the dashboard
|
||||
|
||||
Pi-Hole comes with a very nice admin dashboard to monitor its activity.
|
||||
It is disabled by default. To enable it, you need to configure `PIHOLE_SERVERIP` to the IP of your server:
|
||||
|
||||
```bash
|
||||
PIHOLE_SERVERIP="192.168.1.2"
|
||||
. btcpay-setup.sh -i
|
||||
```
|
||||
|
||||
If your device is using pi-hole as a DNS server, you should now be able to browse `http://pi.hole/admin` to connect to your dashboard.
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user