docker
/
docker-pi-hole
mirror of https://github.com/pi-hole/docker-pi-hole.git
1
0
Fork 0
Code Issues Releases Wiki Activity
928 Commits 9 Branches 114 Tags 4.5 MiB
Commit Graph

928 Commits

Author SHA1 Message Date
dfsx1 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
Adam Warner 8c62a1437a
Merge pull request #690 from damajor/patch-1 
Add QUERY_LOGGING missing export
 2020-12-03 18:18:12 +00:00
Adam Warner 90dada0a8a
prep dev for 5.2.1 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-12-02 21:34:25 +00:00
Adam Warner 121f3f92c9
Merge pull request #714 from mparramont/patch-1 
Fix file to copy in  README.md
 2020-12-02 21:32:52 +00:00
Adam Warner 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
Miguel Parramon b669826149 Update README.md 
😄

Signed-off-by: Miguel Parramón <mparramont@gmail.com>
 2020-12-02 15:36:57 +08:00
DL6ER 105eb1165f
Update README.md 
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
 2020-12-01 19:56:55 +01:00
Adam Warner 941e433834
accidentally 4x= 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-11-30 22:15:31 +00:00
Adam Warner 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
Adam Hill 1c421b0f7c
Merge pull request #706 from pi-hole/dev 
Dev to Master [v5.2]
 2020-11-29 14:47:47 -06:00
Adam Hill 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
Adam Hill f1d4efe766
Unsupported OS detected: Debian 9 
Signed-off-by: Adam Hill <adam@diginc.us>
 2020-11-29 13:29:07 -06:00
Adam Hill 7792b91ccc
set WEB_VERSION 
Signed-off-by: Adam Hill <adam@diginc.us>
 2020-11-29 13:15:05 -06:00
Adam Hill 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
Dan Schaper c90f3c5aa5
Merge pull request #703 from AlexisWilke/dev 
Remove second verb.
 2020-11-12 14:59:06 -08:00
Dan Schaper 352bb55f4c Merge branch 'dev' of https://github.com/alexiswilke/docker-pi-hole into alexiswilke-dev 2020-11-12 13:51:41 -08:00
AlexisWilke 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
Dan Schaper fa065c2434
Merge pull request #704 from lightswitch05/bugfix/broken-sed-tests 
Bugfix: Fix broken sed tests
 2020-11-12 13:12:59 -08:00
Daniel 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
AlexisWilke 30bf5fe0d1 Merge branch 'master' into dev 2020-11-11 15:29:52 -08:00
AlexisWilke 8ba1eea803 Remove second verb. 
Signed-off-by: AlexisWilke <alexis@m2osw.com>
 2020-11-11 07:17:13 -08:00
-_- 9324107088
QUERY_LOGGING Documentation update 2020-10-11 17:28:37 +02:00
-_- 2c7be7c3cb
Add missing QUERY_LOGGING in export list 2020-10-11 17:23:03 +02:00
Adam Hill 1f64381ebb
Merge pull request #683 from lightswitch05/feature/make-buster-the-default-debian-version 
Make buster the default debian version
 2020-10-03 20:36:37 -05:00
Daniel a779c7fc37
Make the default debian version buster, preserve the 'stretch' tag for those who need it. 
Signed-off-by: Daniel <daniel@developerdan.com>
 2020-09-28 17:12:03 -04:00
Adam Hill 87132465b5
Merge pull request #672 from AthrogatePEQ/master 
Ability to skip Gravity refresh on startup
 2020-08-22 20:38:17 -05:00
Athrogate 97d00cd936 Update README.md 
Documenting the SKIPGRAVITYONBOOT variable.

Signed-off-by: Tyler Spires <shadrach145@gmail.com>
 2020-08-22 18:17:17 -04:00
Athrogate 5a35eca5e2 Update README.md 
Signed-off-by: Tyler Spires <shadrach145@gmail.com>
 2020-08-22 18:17:17 -04:00
Athrogate 6e5bf71595 Update README.md 
Signed-off-by: Tyler Spires <shadrach145@gmail.com>
 2020-08-22 18:17:17 -04:00
Athrogate a9f423ff37 Update README.md 
Signed-off-by: Tyler Spires <shadrach145@gmail.com>
 2020-08-22 18:17:17 -04:00
Athrogate a30bd0528f Update README.md 
Signed-off-by: Tyler Spires <shadrach145@gmail.com>
 2020-08-22 18:17:17 -04:00
Athrogate 8770b9789b Update 20-start.sh 
Signed-off-by: Tyler Spires <shadrach145@gmail.com>
 2020-08-22 18:17:17 -04:00
Athrogate 7248b3c915 Update 20-start.sh 
Signed-off-by: Tyler Spires <shadrach145@gmail.com>
 2020-08-22 18:17:17 -04:00
Athrogate e15017d69a Update 20-start.sh 
Signed-off-by: Tyler Spires <shadrach145@gmail.com>
 2020-08-22 18:17:17 -04:00
Adam Hill 52e819a975
Merge pull request #674 from pi-hole/master 
Sync dev from master
 2020-08-22 15:27:34 -05:00
Adam Hill 7199d938e1
Merge pull request #661 from fawaf/master 
use docker-compose example yaml
 2020-08-22 14:39:39 -05:00
Felix Wong 93b86c8981
use docker-compose example yaml 
Signed-off-by: Felix Wong <felix@fawong.com>
 2020-08-17 20:09:39 +00:00
Adam Hill daa3c1e45c
releases tags with ^v 2020-08-09 21:39:57 -05:00
Adam Hill 41f109cf48
Bump web version 2020-08-09 21:22:28 -05:00
Adam Hill fda66e2f67
Update VERSION 2020-08-09 17:31:46 -05:00
Adam Hill 54e5846c16
Merge pull request #632 from pi-hole/dev 
Dev to Master - docker fixes release
 2020-08-09 17:28:03 -05:00
Adam Hill bba93dea3e reset the arch image array between debian versions 
Signed-off-by: Adam Hill <adam@diginc.us>
 2020-07-17 22:10:10 -05:00
Adam Hill d96a7fe887 return to original to double check if it build branch pushes separately from PRs or not 
Signed-off-by: Adam Hill <adam@diginc.us>
 2020-07-17 21:41:57 -05:00
Adam Hill 28bec77984 fix repo name 
Signed-off-by: Adam Hill <adam@diginc.us>
 2020-07-17 20:51:19 -05:00
Adam Hill 9c791f099f Allow internal PRs to push 
Signed-off-by: Adam Hill <adam@diginc.us>
 2020-07-17 20:35:55 -05:00
Adam Hill 6fc9d4d186
Merge pull request #657 from lightswitch05/feature/drop-circle-ci 
Remove circle-ci since it was not updated to work with multi-debian builds
 2020-07-16 16:07:02 -05:00
Daniel 7ad7b0824f
Report docker build and tag exit code to halt the tests on failure to build 
Signed-off-by: Daniel <daniel@developerdan.com>
 2020-07-16 16:49:12 -04:00
Daniel c8781ee427 Remove circle-ci since it was not updated to work with multi-debian builds and is replaced with Github Actions 
Signed-off-by: Daniel <daniel@developerdan.com>
 2020-07-16 16:32:33 -04:00
Daniel 51daf5cba2
Merge branch 'master' of github.com:pi-hole/docker-pi-hole into bugfix/resolve-dev-merge-conflicts 
Signed-off-by: Daniel <daniel@developerdan.com>
 2020-07-16 16:26:21 -04:00