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

907 Commits

Author SHA1 Message Date
AlexisWilke 2bd15dea8f
Remove second verb. 
Signed-off-by: AlexisWilke <alexis@m2osw.com>
 2020-11-12 13:51:17 -08: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
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
Adam Hill 8e5b17e7d3
Merge pull request #653 from pi-hole/v5.1 
v5.1.1
 2020-07-15 19:03:39 -05:00
Adam Hill 562b6c1d5a Dockerfile.py aborts on error now, workaround whiptail not being wrapped by unattended 
Signed-off-by: Adam Hill <adam@diginc.us>
 2020-07-15 18:42:29 -05:00
Adam Hill 0b2c4642df v5.1.1 
Signed-off-by: Adam Hill <adam@diginc.us>
 2020-07-15 18:17:33 -05:00
Adam Hill 1b4677b5ed pull base image 
Signed-off-by: Adam Hill <adam@diginc.us>
 2020-07-15 17:42:24 -05:00
Adam Hill 0958583bf2 debian, our one true savior from bad docker build base images 
Signed-off-by: Adam Hill <adam@diginc.us>
 2020-07-15 17:42:14 -05:00
Adam Hill b50e94e22d revert 
Signed-off-by: Adam Hill <adam@diginc.us>
 2020-07-15 17:41:12 -05:00
Adam Hill bb8a8aeedd fix pip 
Signed-off-by: Adam Hill <adam@diginc.us>
 2020-07-15 17:15:35 -05:00
Adam Hill d49eebc25d fix pip in outer build container, commit templating 
Signed-off-by: Adam Hill <adam@diginc.us>
 2020-07-15 17:04:47 -05:00
Adam Hill 4808b9fe8d v5.1 
Signed-off-by: Adam Hill <adam@diginc.us>
 2020-07-15 16:48:50 -05:00
Adam Hill 88fd258043
Merge pull request #635 from lightswitch05/feature/introduce-debian-version-tags 
Introduce additional docker tags for the debian version.
 2020-06-29 10:23:13 -05:00
Daniel 752d83aeaa
Introduce additional docker tags for the debian version. 
* Added new docker tag variations to specify the debian version ('stretch', and 'buster').
* Arch images are alway as specific as possible: pihole/pihole:master-amd64-stretch
* Multiarch images have both the specific debian version tags as well as the generic non-debian tags: pihole/pihole:master-stretch & pihole/pihole:master
* Currently, the non-specific tags point to the 'stretch' images. Eventaully it can be migrated to 'buster'.
* Use GitHub actions to do the builds. Although the script names include 'gh-actions' to differentiate them from the 'circle' scripts, there is zero logic that is specific to Github (ie. no Github environment variables).
* 'armhf:buster' & 'arm64:buster' has an issue with `ip route get`. I think the issue is related to 'qemu', but I'm not sure. Update the `validate_env` function to only use `ip route get` if `nc` reports something strange.

Signed-off-by: Daniel <daniel@developerdan.com>
 2020-06-29 09:34:19 -04:00
Adam Hill 3b8227c29d
Make image a parameter to allow running with any image 2020-06-03 08:34:28 -05:00
Adam Hill 25d32da895
Merge pull request #631 from pi-hole/new_volume_test_base 
New volume test
 2020-06-02 16:50:37 -05:00
Adam Hill 022b039718 added remove + recreate container test 
Signed-off-by: Adam Hill <adam@diginc.us>
 2020-06-02 12:27:09 -05:00
Adam Hill d832213e3c limit branches to be built 
Signed-off-by: Adam Hill <adam@diginc.us>
 2020-06-02 08:59:37 -05:00
Adam Hill 765eccea22 Merge branch 'dev' of github.com:diginc/docker-pi-hole into new_volume_test_base 
Signed-off-by: Adam Hill <adam@diginc.us>
 2020-06-02 08:21:48 -05:00
Adam Hill 3b34fecc41
Merge pull request #618 from pi-hole/no_resolv_check 
remove resolv.conf code
 2020-05-30 18:30:48 -05:00
Adam Hill 9213bbd322 Merge branch 'dev' of github.com:diginc/docker-pi-hole into no_resolv_check 
Signed-off-by: Adam Hill <adam@diginc.us>
 2020-05-30 18:03:05 -05:00
Adam Hill 5b75953d91 New bash integration style test for volume data 
Signed-off-by: Adam Hill <adam@diginc.us>
 2020-05-30 18:01:43 -05:00
Adam Hill ce3d6e866e
Merge pull request #628 from SuperSandro2000/patch-1 
Don't bind to 127.0.0.1 when listening on all ports
 2020-05-30 14:25:55 -05:00
Adam Hill b093aaabd9
Merge pull request #626 from lightswitch05/feature/run-tests-on-github-actions 
Feature: Run tests on GitHub actions
 2020-05-30 14:24:39 -05:00