changed env var/file for docker-compose

Cielquan · Aug 4, 2019 · 93f1b97 · 93f1b97
1 parent 7866d6f
commit 93f1b97
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -44,8 +44,10 @@ services:
  - unbound
  image: pihole/pihole:latest
  env_file:
- - ./pihole-docker/default.env
- - ./pihole-docker/custom.env
+ - ./pihole-docker/configs/default.conf
+ - ./pihole-docker/configs/server.conf
+ environment:
+ - TZ=${TZ:-Europe/London}
  volumes:
  - ./pihole-docker/resolv.conf:/etc/resolv.conf
  - ./pihole-docker/configs/pihole/:/etc/pihole/
@@ -69,7 +71,7 @@ services:
  hostname: ${HOSTNAME}
  image: mvance/unbound-rpi:latest
  environment:
- - TZ=${TIMEZONE}
+ - TZ=${TZ:-Europe/London}
  volumes:
  - ./unbound-docker/configs:/opt/unbound/etc/unbound/
  - ./unbound-docker/var:/opt/unbound/etc/unbound/var/

diff --git a/pihole-docker/default.env → pihole-docker/configs/default.conf b/pihole-docker/default.env → pihole-docker/configs/default.conf