Merge pull request #705 from pi-hole/release-prep

Prepped dev for 5.2 which will then goto master for tagging
This commit is contained in:
Adam Hill 2020-11-29 13:42:32 -06:00 committed by GitHub
commit 72a1c8290d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions

View File

@ -1 +1 @@
v5.1.2
v5.2

View File

@ -4,7 +4,10 @@ mkdir -p /etc/pihole/
mkdir -p /var/run/pihole
# Production tags with valid web footers
export CORE_VERSION="$(cat /etc/docker-pi-hole-version)"
export WEB_VERSION="v5.1.1"
export WEB_VERSION="${CORE_VERSION}"
export PIHOLE_SKIP_OS_CHECK=true
# Overwrite WEB_VERSION if core and web versions are different
#export WEB_VERSION="v5.1.1"
# Only use for pre-production / testing
export CHECKOUT_BRANCHES=false