0f618ffc31
bump core and web version numbers
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-01-19 12:41:46 +00:00
91fd3933aa
Merge pull request #761 from pi-hole/master
...
Master back into Dev
2021-01-16 20:28:22 +00:00
c75ca906e7
Merge pull request #760 from pi-hole/fix/latest-tag
...
Use Location: header for GitHub API call for latest tag detection.
2021-01-16 20:07:19 +00:00
494667c85d
Use Location: header for GitHub API call
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2021-01-16 11:45:26 -08:00
9bcd8e163a
Merge pull request #758 from pi-hole/dev
...
Latest versions to master
2021-01-16 09:13:07 -06:00
b154947cb9
Merge branch 'master' into dev
2021-01-16 13:05:57 +00:00
1d35a336b4
Merge pull request #754 from pi-hole/fix/query_logging
...
Ensure that QUERY_LOGGING value is persisted between container runs
2021-01-16 12:34:29 +00:00
0d9fc510cf
Merge pull request #757 from pi-hole/release-prep
...
Prepare for new release
2021-01-16 12:34:02 +00:00
1aefa3b063
bump core and web version numbers (we _have_ to find a better way!)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-01-15 20:42:32 +00:00
39090babf5
Ensure that QUERY_LOGGING value is persisted between container runs
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-01-09 21:45:17 +00:00
5c21f146f4
Merge pull request #741 from pi-hole/dev
...
v5.2.2 and various to master
2020-12-25 00:04:17 +00:00
99b6dc9503
Merge pull request #740 from pi-hole/release-prep
...
Bump Version number to latest Pi-hole Core
2020-12-24 13:56:51 -06:00
a445507627
Bump to latest Pi-hole core version (web is at the same version currently)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-12-24 11:20:32 +00:00
f445660079
Merge pull request #739 from shaderecker/typos
...
Fix typo in cronjob comment
2020-12-23 19:02:44 +00:00
c0bf6c91f6
Merge pull request #738 from shaderecker/docu
...
Documentation updates
2020-12-23 18:58:34 +00:00
a6eaf7313c
Fix typo in cronjob comment
...
Signed-off-by: Sebastian Haderecker <sebastian.haderecker@gmail.com>
2020-12-23 18:18:18 +00:00
5dbf46aa05
Fix formatting, typos and the link
...
Signed-off-by: Sebastian Haderecker <sebastian.haderecker@gmail.com>
2020-12-23 16:21:23 +00:00
6ef8ef1f15
We use Github Actions
...
Signed-off-by: Sebastian Haderecker <sebastian.haderecker@gmail.com>
2020-12-23 16:03:22 +00:00
e6bff1ac32
Merge pull request #727 from pi-hole/new/setallthedns
...
Re-jig how Pi-hole's upstream DNS servers are set
2020-12-19 18:43:36 +00:00
f1cc22e5e0
Merge pull request #731 from pi-hole/master
...
Sync master to dev
2020-12-19 12:37:24 -06:00
325c49f7b3
Merge pull request #722 from dfsx1/dev
...
Upgrade s6-overlay to v2.1.0.2
2020-12-19 18:06:24 +00:00
0cb7324a60
Further simplifications
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-12-16 22:19:20 +00:00
f77e4609ce
Introduce new env VAR for setting PIHOLE_DNS_x values.
...
If not set, keep existing values in setupVars
if no existing values in setupVars - fall back to defaults
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-12-16 21:41:09 +00:00
b0a14b7eb9
Merge pull request #721 from pi-hole/tweak/envVars
...
Prevent unset env vars overwriting setupvars.conf values
2020-12-16 18:03:42 +00:00
c525df56fa
Merge pull request #725 from pi-hole/update/remove-traefik-docs
...
Remove outdated configuration
2020-12-13 14:18:55 -08:00
02a28b25ae
Remove outdated configuration
...
This uses environment variables that do not exist.
2020-12-11 10:06:13 -08:00
9bdfe868bd
S6_VERSION: v2.1.0.2
...
https://github.com/just-containers/s6-overlay/releases/tag/v2.1.0.2
Signed-off-by: dfsx1 <dfsx1@users.noreply.github.com>
2020-12-07 21:58:04 +01:00
5d1d394b1b
Test for env vars being set before changing settings. Should preserve values set in setupVars.conf
...
Co-authored-by: xBelladonna <isabelladonnamoore@outlook.com>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-12-04 11:20:16 +00:00
8c62a1437a
Merge pull request #690 from damajor/patch-1
...
Add QUERY_LOGGING missing export
2020-12-03 18:18:12 +00:00
89972b3ce5
Merge pull request #717 from pi-hole/dev
...
Dev to Master [5.2.1]
2020-12-02 16:38:10 -06:00
90dada0a8a
prep dev for 5.2.1
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-12-02 21:34:25 +00:00
121f3f92c9
Merge pull request #714 from mparramont/patch-1
...
Fix file to copy in README.md
2020-12-02 21:32:52 +00:00
ee42fdae04
Merge pull request #712 from pi-hole/tweak/REV_SERVER
...
Introduce new REV_SERVER environment variables. Deprecate CONDITIONAL_FORWARDING ones, but maintain backward compatibility
2020-12-02 21:31:38 +00:00
b669826149
Update README.md
...
😄
Signed-off-by: Miguel Parramón <mparramont@gmail.com>
2020-12-02 15:36:57 +08:00
105eb1165f
Update README.md
...
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
2020-12-01 19:56:55 +01:00
941e433834
accidentally 4x=
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-11-30 22:15:31 +00:00
e7bfad6301
Introduce new REV_SERVER environment variables. Deprecate CONDITIONAL_FORWARDING ones, but maintain backward compatibility
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-11-30 21:46:50 +00:00
1c421b0f7c
Merge pull request #706 from pi-hole/dev
...
Dev to Master [v5.2]
2020-11-29 14:47:47 -06:00
72a1c8290d
Merge pull request #705 from pi-hole/release-prep
...
Prepped dev for 5.2 which will then goto master for tagging
2020-11-29 13:42:32 -06:00
f1d4efe766
Unsupported OS detected: Debian 9
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-11-29 13:29:07 -06:00
7792b91ccc
set WEB_VERSION
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-11-29 13:15:05 -06:00
9a94ade8dd
Prepped dev for 5.2 which will then goto master for tagging
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-11-29 12:55:27 -06:00
c90f3c5aa5
Merge pull request #703 from AlexisWilke/dev
...
Remove second verb.
2020-11-12 14:59:06 -08:00
352bb55f4c
Merge branch 'dev' of https://github.com/alexiswilke/docker-pi-hole into alexiswilke-dev
2020-11-12 13:51:41 -08:00
2bd15dea8f
Remove second verb.
...
Signed-off-by: AlexisWilke <alexis@m2osw.com>
2020-11-12 13:51:17 -08:00
e67952eaec
Merge branch 'dev' into patch-1
2020-11-12 22:44:42 +01:00
fa065c2434
Merge pull request #704 from lightswitch05/bugfix/broken-sed-tests
...
Bugfix: Fix broken sed tests
2020-11-12 13:12:59 -08:00
e64f2d682b
Lock Python version to 3.8 since it is being referenced in SED command
...
Signed-off-by: Daniel <daniel@developerdan.com>
2020-11-12 15:51:20 -05:00
30bf5fe0d1
Merge branch 'master' into dev
2020-11-11 15:29:52 -08:00
8ba1eea803
Remove second verb.
...
Signed-off-by: AlexisWilke <alexis@m2osw.com>
2020-11-11 07:17:13 -08:00
Adam Warner
Dan Schaper
Adam Hill
Sebastian Haderecker
dfsx1
Miguel Parramon
DL6ER
AlexisWilke
-_-
Daniel