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

833 Commits

Author SHA1 Message Date
Daniel 6939ea024f
Simplify Dockerfile configuration. 
* Simplify docker builds by consolidating all arch's into a single Dockerfile and using ARGS for various differences
* Introduce docker-compose based builds (build.yml) for simple management of the various args differences

Signed-off-by: Daniel <daniel@developerdan.com>
 2020-05-15 16:06:48 -04:00
Adam Hill 8cb67fde23
Merge pull request #515 from mgalgs/docker-run-storage-dir 
docker_run.sh: Add env var to specify storage directory
 2020-05-11 19:02:30 -05:00
Adam Hill 740248f18b
Add quote for path 2020-05-11 18:38:19 -05:00
Adam Hill 34ef3d4d86 Merge branch 'master' of github.com:pi-hole/docker-pi-hole into dev 2020-05-10 15:23:58 -05:00
Adam Hill 0a4c0af9a2 use tags for v5.0 show official release in footer 
Signed-off-by: Adam Hill <adam@diginc.us>
 2020-05-10 13:42:57 -05:00
Adam Hill eb637e07cc
Merge pull request #611 from pi-hole/beta-v5.0 
v5.0 to master
 2020-05-10 13:18:24 -05:00
Adam Hill e78260cf8b Fixing web version/build failure 
Signed-off-by: Adam Hill <adam@diginc.us>
 2020-05-10 12:43:41 -05:00
Adam Hill 6265a3c88f Revert "disable arm64" 
This reverts commit 154272be8a.
 2020-05-10 12:12:23 -05:00
Adam Hill 2c47cfa8c5 Merge branch 'master' of github.com:pi-hole/docker-pi-hole into beta-v5.0 2020-05-10 12:06:26 -05:00
Adam Hill 154272be8a disable arm64 
Signed-off-by: Adam Hill <adam@diginc.us>
 2020-05-10 12:04:43 -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 ce10b7b655
Merge pull request #562 from NazarKosteckij/patch-1 
add missing env variables (Fix issue #553)
 2020-05-06 21:46:47 -05:00
Adam Hill 032b53799d
Merge pull request #534 from warren-fisher/dev 
Add to Ubuntu install section
 2020-05-06 21:46:29 -05:00
Adam Warner 415ccbb132
restore ${CORE_VERSION} variable to FTL checkout command 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-04-19 12:42:35 +01:00
Adam Hill b9b8b1f8bd
Merge pull request #599 from pi-hole/test/ftl-patch 
Latest CI error is a build script failure not a real build/test failure.  Its trying to push an image with this branch name as the docker tag but the image was built with v5 branch tag. merging shouldn't hurt
 2020-04-18 18:48:42 -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 1b5abd4ad6
test 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-04-18 18:46:00 +01:00
Adam Hill 0f73f390a9 Merge branch 'master' of github.com:pi-hole/docker-pi-hole into dev 2020-03-16 17:57:54 -05:00
Adam Hill e0e6b491c9
Update circle-deploy.sh 2020-03-16 17:57:21 -05:00
Adam Hill e6a9cd5ce2
Merge pull request #584 from lightswitch05/feature/support-docker-secrets-for-web-password 
Support docker secrets for web password
 2020-02-27 14:30:16 -06:00
Adam Hill 931aad4cb1
Merge pull request #577 from pi-hole/dev 
Dev to Master to release 4.4
 2020-02-26 12:24:13 -06:00
Daniel 64892423b6
Added 'WEBPASSWORD_FILE' environment variable to enable support for Docker Secrets. 
If 'WEBPASSWORD' is set, 'WEBPASSWORD_FILE' is ignored. If 'WEBPASSWORD' is empty, and 'WEBPASSWORD_FILE' is set to a valid readable file, then 'WEBPASSWORD' will be set to the contents of 'WEBPASSWORD_FILE'.

Signed-off-by: Daniel <daniel@developerdan.com>
 2020-02-26 13:13:20 -05:00
Adam Hill b39a6af9b5
Merge pull request #582 from pi-hole/latest_deploy 
Latest deploy
 2020-02-26 10:33:36 -06:00
Adam Hill db919a22cc
Back to latest tag 
Signed-off-by: Adam Hill <adam@diginc.us>
 2020-02-26 10:30:03 -06:00
Adam Hill d20bde221b
Comment + test latest hub tag 
Signed-off-by: Adam Hill <adam@diginc.us>
 2020-02-26 08:57:38 -06:00
Adam Hill 91ab080476 skip local scope coding, not needed 
Signed-off-by: Adam Hill <adam@diginc.us>
 2020-02-25 21:56:31 -06:00
Adam Hill 3fb82b0fde typo 
Signed-off-by: Adam Hill <adam@diginc.us>
 2020-02-25 21:43:54 -06:00
Adam Hill 730ee6952a Try to deploy latest if the circle build matches latest tag 
Signed-off-by: Adam Hill <adam@diginc.us>
 2020-02-25 21:39:39 -06:00
Dan Schaper 76d2578b77
Merge pull request #581 from pi-hole/v4.4 
target core version 4.4
 2020-02-25 15:39:19 -08: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 Warner de7e563ad2
target core version 4.4 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-02-25 20:57:20 +00:00
Adam Hill d102ba94e5
Merge pull request #579 from lightswitch05/feature/improve-healthcheck-responsiveness 
Improve healthcheck responsiveness
 2020-02-25 09:24:26 -06:00
Daniel cf6d74a2be
Improve healthcheck responsiveness. 
By default, dig will retry 2 times (for a total of 3 attempts) to get a response back. Each attempt defaults to 5 seconds. Before this change, a single docker healtcheck failure would really mean three failures and would take a total of 15 seconds before failing. By default, docker healthchecks will retry 3 times before considering a service unhealhy (with a 30 second interval). Combined with dig retries, this means it would take a total of 9 failed DNS responses before it considers the pihole to be unhealthy. Combining the retry between dig and docker, dig considers it a success if even 1/3 responses are recieved - and docker considers it a success if only 1/3 of those successes are successful. I'm not great at math - and order does make a difference - but I think that means as long as 1/9th of DNS queries are being answered - then docker thinks its healthy. Anyways, long story sort, dig doesn't need to have its own retry logic since docker already has a configuarable retry. I also disable recurse since the goal is to test this specific instance.

Also removed duplicate import statement.

Signed-off-by: Daniel <daniel@developerdan.com>
 2020-02-25 08:55:09 -05:00
Adam Warner 80cea505c4
Merge pull request #578 from pi-hole/release-v4.3.4 
update for core 4.3.5
 2020-02-25 10:22:59 +00:00
Adam Warner c0c72219a9
Did I say 4.3.4? I spoke too soon 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-02-24 20:18:27 +00:00
Adam Warner 6bf15d6577
update for core 4.3.4 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-02-24 18:05:02 +00:00
Adam Hill 2fdcf19223
Merge pull request #576 from pi-hole/upgrade_v4.3.3 
Upgrade v4.3.3
 2020-02-24 09:11:53 -06: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 Warner 18eb5ffbc8
Set cron time back to midnight, now that we know it works 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-02-17 21:45:06 +00:00
Adam Hill a378a0f696
Merge pull request #569 from pi-hole/tweak-install 
Remove some redundant code from install.sh
 2020-02-16 13:16:31 -06:00
Adam Hill 0570d264ed
Merge pull request #564 from losuler/dev 
Fix minor spelling mistake
 2020-02-16 13:01:36 -06:00
Adam Warner b74f50ba37
remove unnesacery lines from install.sh 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-02-16 17:43:21 +00:00
Adam Warner 31132aa4ec
Wild experimentations to see what circle does... 2020-02-16 10:53:49 +00:00
Adam Hill 5367761311
cront soon 2020-02-14 13:15:35 -06:00
Adam Hill 6091299fbf
build + nightly build 2020-02-14 13:02:23 -06:00
Adam Hill f523449d73
filter->filters 2020-02-14 12:58:02 -06:00
Adam Hill eb683cf043
CI rebuild nightly schedule 2020-02-14 12:56:38 -06:00
Adam Hill f0a9a9fb04
Merge pull request #565 from scott-kirk/patch-1 
Minor spelling mistake in README
 2020-02-09 12:46:43 -06:00
Scott Kirkpatrick bf0a9190c8
Minor spelling mistake in README 2020-02-09 11:19:04 -05:00