Repalce PIHOLE_TAG with PIHOLE_VERSION, it isn't actually needed after all.
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
This commit is contained in:
parent
944bc8eb79
commit
3942d9a740
|
@ -56,7 +56,6 @@ jobs:
|
|||
CORE_VERSION=development
|
||||
WEB_VERSION=devel
|
||||
FTL_VERSION=development
|
||||
PIHOLE_TAG=nightly
|
||||
PIHOLE_VERSION=nightly
|
||||
push: true
|
||||
tags: |
|
||||
|
|
|
@ -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 }}
|
||||
|
|
|
@ -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: |
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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}
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -36,4 +36,4 @@ fi
|
|||
|
||||
pihole -v
|
||||
|
||||
echo " Container tag is: ${PIHOLE_TAG}"
|
||||
echo " Container tag is: ${PIHOLE_VERSION}"
|
Loading…
Reference in New Issue