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

198 Commits

Author SHA1 Message Date
jparenas 73378d1231 Add CUSTOM_CACHE_SIZE environment variable to the available options 
Signed-off-by: jparenas <juan.p.arenas1@gmail.com>
 2021-05-08 16:11:57 -05:00
static-void-main 6292fd1294 Add i386 arch 
Signed-off-by: static-void-main <33235498+static-void-main@users.noreply.github.com>
 2021-04-15 00:15:31 +02: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
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 022b039718 added remove + recreate container test 
Signed-off-by: Adam Hill <adam@diginc.us>
 2020-06-02 12:27:09 -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 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 72f5730d56 have tests use - not _ in tag 
Signed-off-by: Adam Hill <adam@diginc.us>
 2020-05-28 08:25:49 -05:00
Adam Hill d7fdb188ed remove resolv conf checks 
Signed-off-by: Adam Hill <adam@diginc.us>
 2020-05-26 10:45:48 -05:00
Adam Hill d444a11ad1 Merge branch 'dev' of github.com:pi-hole/docker-pi-hole into beta-v5.0 2020-05-10 11:58:22 -05:00
Adam Hill 3c510e2edb remove HTML web port sed/test, no hits exist anymore 
Signed-off-by: Adam Hill <adam@diginc.us>
 2020-04-18 15:18:15 -05:00
Dan Schaper 36c1e66dc1
Convert regex string to raw. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2020-04-18 12:48:51 -07:00
Adam Warner ca9bf8ce5c
This should fix the tests 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-02-25 22:50:38 +00:00
Adam Hill c024dcd8d9 Upgrade v4.3.3 
Also remove ipv6 from tests, validation fails and breaks tests

Signed-off-by: Adam Hill <adam@diginc.us>
 2020-02-23 22:33:42 -06:00
Adam Hill 4c4e9c3bc9 Beta v5.0 
Signed-off-by: Adam Hill <adam@diginc.us>
 2020-02-03 23:39:03 -06:00
Adam Hill 3765d41b5c Update way too much 
- Tox py3.7 + pipenv
- Python3 Dockerfile.py
- Dockerfile.py tags remote instead of just local image names now
- Circle.sh instead of in-line circle.yml script breakout
- probably other stuff I forgot
- Docker images build during the tests should hopefullly now be available at the deploy job workflow thanks to shared docker layers.
- Rename aarch64 to arm64 to reduce custom map
 2020-01-30 20:26:57 -06:00
Adam Hill 9c5393dfa0
Merge branch 'dev' of github.com:diginc/docker-pi-hole into armel 
Signed-off-by: Adam Hill <adam@diginc.us>
 2020-01-01 21:25:53 -06:00
Adam Hill 096c6b5848
added armel with manual patch for now 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-12-31 21:42:26 -06:00
Adam Hill 8ab895b38a
bump some versions, remove unused 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-12-31 18:02:22 -06:00
cclauss 6987b36981 Use print() function in both Python 2 and Python 3 
Legacy __print__ statements are syntax errors in Python 3 but __print()__ function works as expected in both Python 2 and Python 3.
 2019-08-31 22:07:13 +02:00
Adam Hill 89717949c4
Revert "missed test update" 
This reverts commit 20b130a666.
 2019-06-01 12:18:10 -05:00
Martin Buchleitner 09131ad78f Merge branch 'master' into k8s 
* master:
  Official tag time
  Docker Pi-hole v4.3
 2019-05-28 09:15:08 +02:00
Martin Buchleitner 7c402d329a updated 2019-05-28 09:14:21 +02:00
Martin Buchleitner 20b130a666 missed test update 
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill 8ce0aafcd3 Fix #364 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill bbb770b6c0 disable this trash test 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill fea14ae5a4 sync 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill 7da8fa586b does this work any better 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill a4c4de3cf4 maybe 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill fded8bdcc4 show me your secrets 
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill 49d17bded0 back to using 2 dns 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill fea57446a5 revert to old setup 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill 41fc498166 Slow down after setup to try to fix test 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill 3e76bbd51f add some more details to ouput to debut travis failure 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill 7cb09b78db empty the adlist for tests 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill 062f94d0f7 Another flaky test, logs of readme 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill 1322db7ec3 Slow down all the flakey tests to pass 100% 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill 07bc55786b Fixed tests! 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill 397ec03285 remove ServerIP requirement, simpler example commands 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Martin Buchleitner f950671a1c missed test update 
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-08 08:31:42 +02:00
Adam Hill 02e3ead7eb
Docker Pi-hole v4.3 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-04-11 22:17:26 -05:00
Adam Hill 5dfa5398b8
Fix #364 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-02-17 00:18:34 -06:00
Adam Hill ceda92b0f2
disable this trash test 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-02-14 21:01:36 -06:00
Adam Hill 0563a3c795
sync 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-02-14 20:05:53 -06:00
Adam Hill 5f36094b21
does this work any better 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-02-14 19:55:18 -06:00
Adam Hill f0e2d705dc
maybe 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-02-14 00:48:03 -06:00
Adam Hill ca3fcd6993
show me your secrets 2019-02-14 00:42:05 -06:00
Adam Hill 2040cc5978
back to using 2 dns 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-02-14 00:23:42 -06:00
Adam Hill 1ccea93c16
revert to old setup 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-02-14 00:18:55 -06:00
Adam Hill 9c7b02aba9
Slow down after setup to try to fix test 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-02-13 23:45:17 -06:00
Adam Hill ca4fe84df2
add some more details to ouput to debut travis failure 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-02-13 23:26:21 -06:00
Adam Hill f9a21d2ff9
empty the adlist for tests 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-02-12 22:16:15 -06:00
Adam Hill 1685ed342f
Another flaky test, logs of readme 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-02-09 02:08:20 -06:00
Adam Hill 236b2f1ed6
Slow down all the flakey tests to pass 100% 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-02-09 00:09:37 -06:00
Adam Hill 7ecf7c6f28
Fixed tests! 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-02-08 23:14:48 -06:00
Adam Hill fca7769b33
remove ServerIP requirement, simpler example commands 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-02-07 19:51:15 -06:00
Adam Hill d6642fc191
broken test (works outside tests), not required for release 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-02-03 11:45:40 -06:00
Adam Hill 8ece19132d
deploy support for RCs, fix enable test 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-02-02 12:59:02 -06:00
Adam Hill d3309ebb1a
remove old blocking page setup/test 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-01-21 22:43:38 -06:00
Adam Hill 38d76d7ec8
fix conftest path to VERSION 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-01-21 20:37:05 -06:00
Adam Hill 440a7a19a5
v4.2 and Version pulled from a file now 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-01-20 23:59:35 -06:00
Adam Hill f3cf5dc858
Adding test and check for resolv.conf 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-01-10 00:28:39 -06:00
Adam Hill 19fee6fa5e
README update for 4.1.1 and test improvement 
* split out arg fixture to improve grainularity of test overriding
* README points out new arguments that improve likelihood of success

Signed-off-by: Adam Hill <adam@diginc.us>
 2019-01-08 21:01:42 -06:00
Adam Hill a5211510db
Adding no-daemon opt back in which works with correct capabilities (NET_ADMIN) 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-01-01 14:46:34 -06:00
Adam Hill d0b35cec63
4.1.1 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-12-24 11:23:17 -06:00
Adam Hill 5b3b0009bc
Added test to confirm updates are blocked 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-12-16 12:19:32 -06:00
Adam Hill b3beb91b52
update deploy version to 4.1 and fix broken server test 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-12-13 18:33:38 -06:00
Adam Hill b39a2ad69a
arm version complained/crashed on no TTY 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-12-13 18:33:08 -06:00
Adam Hill d7a125a706
Version 4.1 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-12-12 20:43:08 -06:00
Adam Hill 10c44c9374
switch to using pihole/debian-base for pam fix 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-10-31 22:40:29 -05:00
Adam Hill a47f278df0
cleanup uncessary build dep stuff 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-10-30 21:13:34 -05:00
Adam Hill 63f2c4ea00
Fixing error with random passwords, null checking moved earlier 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-09-18 00:11:26 -05:00
Adam Hill f8d37693ed
Fix regex writing for web, fix deploying latest 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-08-05 22:23:22 -05:00
Adam Hill 65a1ac7f1e
grab version on startup for web footer. 2 tests stablized 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-08-05 18:20:55 -05:00
Adam Hill 999f02b598
start of fixing race condition by not having test+s6 both run /start.sh 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-08-05 18:13:25 -05:00
Adam Hill 80d5b9dbc1
Test image name updates, passing locally. reorg Dockerfile to build fast, starting on new deploy 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-08-04 13:31:58 -05:00
Adam Hill 520669a6b9
merge in dev/master armel goodies 2018-07-19 22:18:34 -05:00
Adam Hill 478b98c503
Merge branch 'dev' of github.com:diginc/docker-pi-hole into prerelease 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-07-17 19:44:34 -05:00
Adam Hill c17cd37eca
armel build script and dockerfile stuffs 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-07-16 23:43:55 -05:00
diginc 70acf54c2c Merge branch 'dev' of github.com:diginc/docker-pi-hole into prerelease 2018-07-10 23:16:40 -05:00
StefanSchoof 3171feef4c allow no for DNS2 2018-07-06 08:01:41 +00:00
diginc 3877a171da fix startup 53 port conflict and test error 2018-07-04 14:11:18 -05:00
diginc ad6b4be403 Fixes to the startup, services, and dnsmasq references 2018-07-03 00:19:01 -05:00
diginc 53f766876e Adding fix for #229 
* Updates references in /var/www/html to also use WEB_PORT custom HTTP port
* Also a deploy script I use for uploading ARM/Multiarch so I stop pulling it out of bash history
 2018-02-22 23:11:53 -06:00
diginc 3bcdd27cb9 fix ipv6 test 2018-01-04 22:30:40 -06:00
diginc b33ea3b77f fixed the tests 2018-01-03 21:35:53 -06:00
diginc 615af98eab delete all the alpine 2018-01-03 20:09:47 -06:00
diginc d9fa9b1016 alpine 3.2 startup tests fixed, web still failing 2017-12-11 10:28:15 -06:00
diginc 7c6c48e133 rest of loading tests fixed, undo heredoc tab2space 2017-12-07 23:39:34 -06:00
diginc 988e17be7a some of the debian_amd64 load_as_expected tests fixed, tab2spaces 2017-12-07 23:30:54 -06:00
diginc aab0b3f3cb fix debian test_pihole_start_cmd 2017-12-07 20:27:06 -06:00
diginc eb7b0a1fd7 add firstboot marker allow setup of servers if they are passed in but never again 2017-11-19 23:15:44 -06:00
diginc 50fee7d832 Adding custom web port with tests 2017-11-14 22:33:05 -06:00
diginc 94c90d9b91 comma 2017-11-05 21:30:32 -06:00
diginc bcfcc85ef3 removed impossible testing combos 2017-11-05 21:30:07 -06:00
diginc 8886784b2e fix webserver and image 2017-10-18 22:24:22 -05:00
diginc dded3945f5 switch to dash, update persist to use new style tag 2017-10-18 22:02:23 -05:00
diginc 7c85ac8d32 Split build out from tests to ensure it runs first 2017-10-16 23:45:39 -05:00