Fix regex writing for web, fix deploying latest

Signed-off-by: Adam Hill <adam@diginc.us>

bash_functions.sh

@@ -11,7 +11,9 @@ prepare_configs() {
     # Re-apply perms from basic-install over any volume mounts that may be present (or not)
     chown pihole:root /etc/lighttpd
     chown pihole:pihole "${PI_HOLE_CONFIG_DIR}/pihole-FTL.conf" "/var/log/pihole" "${regexFile}"
-    chmod 644 "${PI_HOLE_CONFIG_DIR}/pihole-FTL.conf" "${regexFile}"
+    chmod 644 "${PI_HOLE_CONFIG_DIR}/pihole-FTL.conf" 
+    # not sure why pihole:pihole user/group write perms are not enough for web to write...dirty fix:
+    chmod 777 "${regexFile}"
     touch /var/log/pihole-FTL.log /run/pihole-FTL.pid /run/pihole-FTL.port /var/log/pihole.log
     chown pihole:pihole /var/run/pihole /var/log/pihole
     test -f /var/run/pihole/FTL.sock && rm /var/run/pihole/FTL.sock

deploy_docker.sh

@@ -51,7 +51,7 @@ for tag in amd64 armhf aarch64; do
     # Floating latest tags (Conditionalize these to master?)
     if [[ "$tag" == 'amd64' ]] && [[ "$branch" == 'master' || "$latest" == 'true' ]] ; then
         # Latest tag should become a manifest for multiple architectures, not just amd64!
-        $dry docker tag pi-hole:v4.0_amd64 pihole/pihole:latest
+        $dry docker tag pihole:v4.0_amd64 pihole/pihole:latest
         $dry docker push pihole/pihole:latest
     fi;
 done

test/conftest.py

@@ -158,5 +158,5 @@ Persistent Docker container for testing service post start.sh
 def RunningPiHole(DockerPersist, Slow, persist_webserver):
     ''' Persist a fully started docker-pi-hole to help speed up subsequent tests '''
     Slow(lambda: DockerPersist.run('pgrep pihole-FTL').rc == 0)
-    Slow(lambda: DockerPersist.run('pgrep {}'.format(persist_webserver) ).rc == 0)
+    Slow(lambda: DockerPersist.run('pgrep lighttpd').rc == 0)
     return DockerPersist