From 3942d9a7407db98eeda677086f6c310ac34dd0c6 Mon Sep 17 00:00:00 2001
From: Adam Warner <me@adamwarner.co.uk>
Date: Sun, 12 Sep 2021 23:43:59 +0100
Subject: [PATCH] Repalce PIHOLE_TAG with PIHOLE_VERSION, it isn't actually
 needed after all.

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
---
 .github/workflows/nightly-build.yml        | 1 -
 .github/workflows/test-and-build.yaml      | 1 -
 .github/workflows/workflow_dispatch.yml    | 1 -
 Dockerfile                                 | 6 ++----
 Dockerfile.py                              | 1 -
 build.yml                                  | 1 -
 install.sh                                 | 6 +++---
 s6/debian-root/etc/cont-init.d/20-start.sh | 2 +-
 8 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index e534417..2be1ccc 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -56,7 +56,6 @@ jobs:
               CORE_VERSION=development
               WEB_VERSION=devel
               FTL_VERSION=development
-              PIHOLE_TAG=nightly
               PIHOLE_VERSION=nightly
             push: true
             tags: |
diff --git a/.github/workflows/test-and-build.yaml b/.github/workflows/test-and-build.yaml
index 5335151..fa8e11e 100644
--- a/.github/workflows/test-and-build.yaml
+++ b/.github/workflows/test-and-build.yaml
@@ -59,7 +59,6 @@ jobs:
           context: .
           platforms: linux/amd64,linux/arm64,linux/i386,linux/arm/v7
           build-args: |
-            PIHOLE_TAG=${{ env.TAG }}
             PIHOLE_VERSION=${{ env.TAG }}
           push: true
           tags: ${{ steps.meta.outputs.tags }}
diff --git a/.github/workflows/workflow_dispatch.yml b/.github/workflows/workflow_dispatch.yml
index 40ebbef..5ad5df5 100644
--- a/.github/workflows/workflow_dispatch.yml
+++ b/.github/workflows/workflow_dispatch.yml
@@ -67,7 +67,6 @@ jobs:
             CORE_VERSION=${{ github.event.inputs.core }}
             WEB_VERSION=${{ github.event.inputs.web }}
             FTL_VERSION=${{ github.event.inputs.ftl }}
-            PIHOLE_TAG=${{ github.event.inputs.name }}
             PIHOLE_VERSION=${{ github.event.inputs.name }}
           push: true
           tags: |
diff --git a/Dockerfile b/Dockerfile
index b996346..f7e8102 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,8 +7,8 @@ ARG WEB_VERSION
 ENV WEB_VERSION "${WEB_VERSION}"
 ARG FTL_VERSION
 ENV FTL_VERSION "${FTL_VERSION}"
-ARG PIHOLE_TAG
-ENV PIHOLE_TAG "${PIHOLE_TAG}"
+ARG PIHOLE_VERSION
+ENV PIHOLE_VERSION "${PIHOLE_VERSION}"
 
 ENV S6_OVERLAY_VERSION v2.1.0.2
 
@@ -46,8 +46,6 @@ ENV ServerIP 0.0.0.0
 ENV FTL_CMD no-daemon
 ENV DNSMASQ_USER root
 
-ARG PIHOLE_VERSION
-ENV VERSION "${PIHOLE_VERSION}"
 ENV PATH /opt/pihole:${PATH}
 
 HEALTHCHECK CMD dig +short +norecurse +retry=0 @127.0.0.1 pi.hole || exit 1
diff --git a/Dockerfile.py b/Dockerfile.py
index 946b675..dc8e44f 100755
--- a/Dockerfile.py
+++ b/Dockerfile.py
@@ -63,7 +63,6 @@ def build(docker_repo: str, arch: str, debian_version: str, hub_tag: str, show_t
     build_env = os.environ.copy()
     build_env['PIHOLE_VERSION'] = os.environ.get('GIT_TAG', None)
     build_env['DEBIAN_VERSION'] = debian_version
-    build_env['PIHOLE_TAG'] = tag_name
     build_command = f'{time_arg} docker-compose -f build.yml build {cache_arg} --pull {arch}'
     print(f' ::: Building {arch} into {create_tag}')
     success = run_and_stream_command_output(build_command, build_env, verbose)
diff --git a/build.yml b/build.yml
index 026a048..a9163b4 100644
--- a/build.yml
+++ b/build.yml
@@ -3,7 +3,6 @@ version: "3.7"
 
 x-common-args: &common-args
   PIHOLE_VERSION: ${PIHOLE_VERSION}
-  PIHOLE_TAG: ${PIHOLE_TAG}
   CORE_VERSION: ${CORE_VERSION}
   WEB_VERSION: ${WEB_VERSION}
   FTL_VERSION: ${FTL_VERSION}
diff --git a/install.sh b/install.sh
index 6861c4c..8c1affb 100644
--- a/install.sh
+++ b/install.sh
@@ -84,11 +84,11 @@ sed -i $'s/)\s*reconfigurePiholeFunc/) unsupportedFunc/g' /usr/local/bin/pihole
 sed -i $'s/)\s*uninstallFunc/) unsupportedFunc/g' /usr/local/bin/pihole
 
 # Inject a message into the debug scripts Operating System section to indicate that the debug log comes from a Docker system.
-sed -i $'s/echo_current_diagnostic "Operating system"/echo_current_diagnostic "Operating system"\\\n    log_write "${INFO} Pi-hole Docker Container: ${PIHOLE_TAG:-PIHOLE_TAG is unset}"/g' /opt/pihole/piholeDebug.sh
+sed -i $'s/echo_current_diagnostic "Operating system"/echo_current_diagnostic "Operating system"\\\n    log_write "${INFO} Pi-hole Docker Container: ${PIHOLE_VERSION:-PIHOLE_VERSION is unset}"/g' /opt/pihole/piholeDebug.sh
 
 # Inject container tag into web interface footer...
-sed -i $"s/<ul class=\"list-unstyled\">/<ul class=\"list-unstyled\">\\n<strong><li>Docker Tag<\/strong> ${PIHOLE_TAG}<\/li>/g" /var/www/html/admin/scripts/pi-hole/php/footer.php
-sed -i $"s/<ul class=\"list-inline\">/<strong>Docker Tag<\/strong> ${PIHOLE_TAG}\\n<ul class=\"list-inline\">/g" /var/www/html/admin/scripts/pi-hole/php/footer.php
+sed -i $"s/<ul class=\"list-unstyled\">/<ul class=\"list-unstyled\">\\n<strong><li>Docker Tag<\/strong> ${PIHOLE_VERSION}<\/li>/g" /var/www/html/admin/scripts/pi-hole/php/footer.php
+sed -i $"s/<ul class=\"list-inline\">/<strong>Docker Tag<\/strong> ${PIHOLE_VERSION}\\n<ul class=\"list-inline\">/g" /var/www/html/admin/scripts/pi-hole/php/footer.php
 
 touch /.piholeFirstBoot
 
diff --git a/s6/debian-root/etc/cont-init.d/20-start.sh b/s6/debian-root/etc/cont-init.d/20-start.sh
index a482ecc..e2ab3a1 100644
--- a/s6/debian-root/etc/cont-init.d/20-start.sh
+++ b/s6/debian-root/etc/cont-init.d/20-start.sh
@@ -36,4 +36,4 @@ fi
 
 pihole -v
 
-echo "  Container tag is: ${PIHOLE_TAG}"
\ No newline at end of file
+echo "  Container tag is: ${PIHOLE_VERSION}"
\ No newline at end of file