3.0.1 progress

alpine.docker

@@ -20,6 +20,7 @@ ENTRYPOINT [ "/init" ]
 
 ADD s6/alpine-root /
 COPY s6/service /usr/local/bin/service
+COPY pihole-FTL /usr/bin/pihole-FTL
 
 # Things installer did and fix alpine+nginx differences
 ENV WEBLOGDIR /var/log/nginx

bash_functions.sh

@@ -135,7 +135,11 @@ setup_web_password() {
         echo "Assigning random password: $WEBPASSWORD"
     fi;
     set -x
-    pihole -a -p "$WEBPASSWORD"
+    if [[ "$WEBPASSWORD" == "" ]] ; then
+		echo "" | pihole -a -p
+    else
+		pihole -a -p "$WEBPASSWORD" "$WEBPASSWORD"
+	fi
     { set +x; } 2>/dev/null
 }
 setup_ipv4_ipv6() {

install.sh

@@ -1,7 +1,8 @@
 #!/bin/bash -x
 mkdir -p /etc/pihole/
-export CORE_TAG='v2.13.2'
-export WEB_TAG='v2.5.2'
+export CORE_TAG='v3.0.1'
+export WEB_TAG='v3.0.1'
+export FTL_TAG='v2.6.2'
 
 #     Make pihole scripts fail searching for `systemctl`,
 # which fails pretty miserably in docker compared to `service`
@@ -21,6 +22,9 @@ if [[ "$IMAGE" == 'alpine' ]] ; then
     sed -i 's/www-data/nginx/g' "$PIHOLE_INSTALL"
     sed -i '/LIGHTTPD_CFG/d' "${PIHOLE_INSTALL}"
     sed -i '/etc\/cron.d\//d' "${PIHOLE_INSTALL}"
+    # For new FTL install lines
+    sed -i 's/sha1sum --status --quiet/sha1sum -s/g' "${PIHOLE_INSTALL}"
+    sed -i 's/install -T/install /g' "${PIHOLE_INSTALL}"
     LIGHTTPD_USER="nginx" # shellcheck disable=SC2034
     LIGHTTPD_GROUP="nginx" # shellcheck disable=SC2034
     LIGHTTPD_CFG="lighttpd.conf.debian" # shellcheck disable=SC2034

s6/alpine-root/etc/nginx/nginx.conf

@@ -18,7 +18,7 @@ http {
         index pihole/index.php index.php;
         error_page 404 =200 /pihole/index.php;
 
-        location ~ .php$ {
+        location ~ /(pihole|admin)/*.php$ {
             fastcgi_pass 127.0.0.1:9000;
             fastcgi_split_path_info ^(.+\.php)(/.+)$;
             fastcgi_index index.php;

s6/alpine-root/etc/services.d/cron/run

@@ -2,6 +2,4 @@
 s6-echo "Starting crond"
 
 exec -c
-fdmove -c 2 1
-
-/usr/sbin/crond -f -L /var/log/cron -l 0 -c /etc/crontabs 
+fdmove -c 2 1 /usr/sbin/crond -f -L /var/log/cron -l 0 -c /etc/crontabs 

s6/alpine-root/etc/services.d/php-fpm/run

@@ -2,4 +2,4 @@
 
 s6-echo "Starting php-fpm"
 
-php-fpm -d daemonize=no
+php-fpm5 -d daemonize=no

s6/debian-root/etc/services.d/cron/run

@@ -2,6 +2,4 @@
 s6-echo "Starting crond"
 
 exec -c
-fdmove -c 2 1
-
-/usr/sbin/cron -f
+fdmove -c 2 1 /usr/sbin/cron -f