Trailing slashes on volumes fail on newer versions of docker-compose (#949)
* Trailing slashes on volumes fail on newer versions of docker-compose See [Issue 947](https://github.com/pi-hole/docker-pi-hole/issues/947) for the background. This PR proposes removing trailing slashes from all documentation, examples and scripts. Signed-off-by: Phill Kelley <pmk.57t49@lgosys.com>
This commit is contained in:
parent
523762e47d
commit
b0a5a0f163
|
@ -28,8 +28,8 @@ services:
|
||||||
# WEBPASSWORD: 'set a secure password here or it will be random'
|
# WEBPASSWORD: 'set a secure password here or it will be random'
|
||||||
# Volumes store your data between container upgrades
|
# Volumes store your data between container upgrades
|
||||||
volumes:
|
volumes:
|
||||||
- './etc-pihole/:/etc/pihole/'
|
- './etc-pihole:/etc/pihole'
|
||||||
- './etc-dnsmasq.d/:/etc/dnsmasq.d/'
|
- './etc-dnsmasq.d:/etc/dnsmasq.d'
|
||||||
# Recommended but not required (DHCP needs NET_ADMIN)
|
# Recommended but not required (DHCP needs NET_ADMIN)
|
||||||
# https://github.com/pi-hole/docker-pi-hole#note-on-capabilities
|
# https://github.com/pi-hole/docker-pi-hole#note-on-capabilities
|
||||||
cap_add:
|
cap_add:
|
||||||
|
@ -71,8 +71,8 @@ This container uses 2 popular ports, port 53 and port 80, so **may conflict with
|
||||||
If you're using a Red Hat based distribution with an SELinux Enforcing policy add `:z` to line with volumes like so:
|
If you're using a Red Hat based distribution with an SELinux Enforcing policy add `:z` to line with volumes like so:
|
||||||
|
|
||||||
```
|
```
|
||||||
-v "$(pwd)/etc-pihole/:/etc/pihole/:z" \
|
-v "$(pwd)/etc-pihole:/etc/pihole:z" \
|
||||||
-v "$(pwd)/etc-dnsmasq.d/:/etc/dnsmasq.d/:z" \
|
-v "$(pwd)/etc-dnsmasq.d:/etc/dnsmasq.d:z" \
|
||||||
```
|
```
|
||||||
|
|
||||||
Volumes are recommended for persisting data across container re-creations for updating images. The IP lookup variables may not work for everyone, please review their values and hard code IP and IPv6 if necessary.
|
Volumes are recommended for persisting data across container re-creations for updating images. The IP lookup variables may not work for everyone, please review their values and hard code IP and IPv6 if necessary.
|
||||||
|
|
|
@ -21,8 +21,8 @@ services:
|
||||||
- "67:67/udp"
|
- "67:67/udp"
|
||||||
- '8053:80/tcp'
|
- '8053:80/tcp'
|
||||||
volumes:
|
volumes:
|
||||||
- './etc-pihole/:/etc/pihole/'
|
- './etc-pihole:/etc/pihole'
|
||||||
- './etc-dnsmasq.d/:/etc/dnsmasq.d/'
|
- './etc-dnsmasq.d:/etc/dnsmasq.d'
|
||||||
# run `touch ./var-log/pihole.log` first unless you like errors
|
# run `touch ./var-log/pihole.log` first unless you like errors
|
||||||
# - './var-log/pihole.log:/var/log/pihole.log'
|
# - './var-log/pihole.log:/var/log/pihole.log'
|
||||||
# Recommended but not required (DHCP needs NET_ADMIN)
|
# Recommended but not required (DHCP needs NET_ADMIN)
|
||||||
|
@ -51,7 +51,7 @@ services:
|
||||||
# ports:
|
# ports:
|
||||||
# - '2368:2368/tcp'
|
# - '2368:2368/tcp'
|
||||||
# volumes:
|
# volumes:
|
||||||
# - '/etc/ghost/:/ghost-override'
|
# - '/etc/ghost:/ghost-override'
|
||||||
# environment:
|
# environment:
|
||||||
# PROXY_LOCATION: ghost
|
# PROXY_LOCATION: ghost
|
||||||
# VIRTUAL_HOST: ghost.yourDomain.lan
|
# VIRTUAL_HOST: ghost.yourDomain.lan
|
||||||
|
|
|
@ -17,8 +17,8 @@ services:
|
||||||
# WEBPASSWORD: 'set a secure password here or it will be random'
|
# WEBPASSWORD: 'set a secure password here or it will be random'
|
||||||
# Volumes store your data between container upgrades
|
# Volumes store your data between container upgrades
|
||||||
volumes:
|
volumes:
|
||||||
- './etc-pihole/:/etc/pihole/'
|
- './etc-pihole:/etc/pihole'
|
||||||
- './etc-dnsmasq.d/:/etc/dnsmasq.d/'
|
- './etc-dnsmasq.d:/etc/dnsmasq.d'
|
||||||
# run `touch ./var-log/pihole.log` first unless you like errors
|
# run `touch ./var-log/pihole.log` first unless you like errors
|
||||||
# - './var-log/pihole.log:/var/log/pihole.log'
|
# - './var-log/pihole.log:/var/log/pihole.log'
|
||||||
# Recommended but not required (DHCP needs NET_ADMIN)
|
# Recommended but not required (DHCP needs NET_ADMIN)
|
||||||
|
|
|
@ -11,8 +11,8 @@ docker run -d \
|
||||||
-p 53:53/tcp -p 53:53/udp \
|
-p 53:53/tcp -p 53:53/udp \
|
||||||
-p 80:80 \
|
-p 80:80 \
|
||||||
-e TZ="America/Chicago" \
|
-e TZ="America/Chicago" \
|
||||||
-v "${PIHOLE_BASE}/etc-pihole/:/etc/pihole/" \
|
-v "${PIHOLE_BASE}/etc-pihole:/etc/pihole" \
|
||||||
-v "${PIHOLE_BASE}/etc-dnsmasq.d/:/etc/dnsmasq.d/" \
|
-v "${PIHOLE_BASE}/etc-dnsmasq.d:/etc/dnsmasq.d" \
|
||||||
--dns=127.0.0.1 --dns=1.1.1.1 \
|
--dns=127.0.0.1 --dns=1.1.1.1 \
|
||||||
--restart=unless-stopped \
|
--restart=unless-stopped \
|
||||||
--hostname pi.hole \
|
--hostname pi.hole \
|
||||||
|
|
|
@ -46,8 +46,8 @@ echo "Testing $IMAGE with volumes base path $VOLUMES"
|
||||||
# Running stock+empty volumes (no ports to avoid conflicts)
|
# Running stock+empty volumes (no ports to avoid conflicts)
|
||||||
CONTAINER="$(
|
CONTAINER="$(
|
||||||
docker run -d \
|
docker run -d \
|
||||||
-v "$VOL_PH:/etc/pihole/" \
|
-v "$VOL_PH:/etc/pihole" \
|
||||||
-v "$VOL_DM:/etc/dnsmasq.d/" \
|
-v "$VOL_DM:/etc/dnsmasq.d" \
|
||||||
-v "/dev/null:/etc/pihole/adlists.list" \
|
-v "/dev/null:/etc/pihole/adlists.list" \
|
||||||
--entrypoint='' \
|
--entrypoint='' \
|
||||||
$IMAGE \
|
$IMAGE \
|
||||||
|
@ -92,8 +92,8 @@ assert_new_settings
|
||||||
docker rm -f $CONTAINER
|
docker rm -f $CONTAINER
|
||||||
CONTAINER="$(
|
CONTAINER="$(
|
||||||
docker run -d \
|
docker run -d \
|
||||||
-v "$VOL_PH:/etc/pihole/" \
|
-v "$VOL_PH:/etc/pihole" \
|
||||||
-v "$VOL_DM:/etc/dnsmasq.d/" \
|
-v "$VOL_DM:/etc/dnsmasq.d" \
|
||||||
-v "/dev/null:/etc/pihole/adlists.list" \
|
-v "/dev/null:/etc/pihole/adlists.list" \
|
||||||
--entrypoint='' \
|
--entrypoint='' \
|
||||||
$IMAGE \
|
$IMAGE \
|
||||||
|
|
Loading…
Reference in New Issue