Merge branch 'development-v6' into idn2

pi-hole · Oct 29, 2023 · 3ee69a3 · 3ee69a3
2 parents 498e60d + 230e14e
commit 3ee69a3
Show file tree

Hide file tree

Showing 14 changed files with 150 additions and 443 deletions.
diff --git a/README.md b/README.md
diff --git a/build-and-test.sh b/build-and-test.sh
@@ -19,4 +19,5 @@ docker run --rm \
     --env PIPENV_CACHE_DIR="$(pwd)/.pipenv" \
     --env GIT_TAG="${GIT_TAG}" \
     --env PY_COLORS=1 \
+    --env TARGETPLATFORM="${PLATFORM}" \
     ${enter} image_pipenv
diff --git a/examples/docker-compose-caddy-proxy.yml b/examples/docker-compose-caddy-proxy.yml
@@ -22,7 +22,7 @@ services:
 
   # More info at https://github.com/pi-hole/docker-pi-hole/ and https://docs.pi-hole.net/
   pihole:
-    depends_on: 
+    depends_on:
       - caddy
     container_name: pihole
     #dns:  # Optional. Specify desired upstream DNS servers here.
@@ -37,17 +37,15 @@ services:
       # Following are NOT proxied through Caddy, bound to host net instead:
       - "53:53/udp"
       - "53:53/tcp"
-      - "853:853/tcp" # DNS-over-TLS 
+      - "853:853/tcp" # DNS-over-TLS
       #- "67:67/udp" # DHCP, if desired. If not bound to host net you need an mDNS proxy service configured somewhere on host net.
         # ref: https://docs.pi-hole.net/docker/DHCP/
     environment:
       TZ: 'America/New_York' # Supported TZ database names: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#Time_Zone_abbreviations
-      WEBPASSWORD: 'password' # Only used on first boot, change with pihole cli then comment out here.
+      FTLCONF_webserver_api_password: 'password'
     volumes:
       - './etc-pihole:/etc/pihole'
       - './etc-dnsmasq.d:/etc/dnsmasq.d'
-      - './etc-lighttpd/external.conf:/etc/lighttpd/external.conf'  # Recommend leave as bind mount for easier editing.
-        # ref for why you may need to change this file: https://docs.pi-hole.net/guides/webserver/caddy/#modifying-lighttpd-configuration
     #cap_add:  # Uncomment if using Pi-hole as DHCP server
       # https://github.com/pi-hole/docker-pi-hole#note-on-capabilities
       #- NET_ADMIN # ONLY required if you are using Pi-hole as your DHCP server, else remove for better security

diff --git a/examples/docker-compose-nginx-proxy.yml b/examples/docker-compose-nginx-proxy.yml
diff --git a/examples/docker-compose.yml.example b/examples/docker-compose.yml.example
diff --git a/examples/docker-pi-hole.cron b/examples/docker-pi-hole.cron
diff --git a/examples/docker_run.sh b/examples/docker_run.sh
diff --git a/examples/pihole.service b/examples/pihole.service
diff --git a/src/Dockerfile b/src/Dockerfile
@@ -48,7 +48,7 @@ RUN git clone --depth 1 --single-branch --branch ${WEB_BRANCH} https://github.co
     elif [ "$TARGETPLATFORM" = "linux/386" ];      then FTLARCH=386; \
     elif [ "$TARGETPLATFORM" = "linux/arm/v6" ];   then FTLARCH=armv6; \
     elif [ "$TARGETPLATFORM" = "linux/arm/v7" ];   then FTLARCH=armv7; \
-    elif [ "$TARGETPLATFORM" = "linux/arm64" ];    then FTLARCH=arm64; \
+    elif [ "$TARGETPLATFORM" = "linux/arm64/v8" ];    then FTLARCH=arm64; \
     elif [ "$TARGETPLATFORM" = "linux/riscv64" ];  then FTLARCH=riscv64; \
     else FTLARCH=amd64; fi \
     && echo "Arch: ${TARGETPLATFORM}, FTLARCH: ${FTLARCH}" \