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 11 Branches 114 Tags 4.6 MiB
Commit Graph

907 Commits

Author SHA1 Message Date
Adam Hill 09eae003cf
Merge pull request #551 from pi-hole/armel 
Armel
 2020-01-02 13:37:47 -06:00
Adam Hill 4ba50052a5
re-enable arm 2020-01-01 21:33:38 -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 9c76d246f6
Merge pull request #550 from pi-hole/circleci 
Circle CI replacing Travis
 2020-01-01 21:25:09 -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 8b51f53bfe
remove armel for now 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-12-31 21:41:31 -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
Adam Hill 3a0b1b197c
upgrade pip 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-12-31 17:48:09 -06:00
Adam Hill 3d8fed70e7
updated pip freeze 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-12-31 17:45:35 -06:00
Adam Hill c2bca952a4
forgot requirements.txt 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-12-31 17:42:08 -06:00
Adam Hill 0c5468ba29
more command fixes 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-12-31 16:57:37 -06:00
Adam Hill 18b1f446ab
command typo 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-12-31 16:56:08 -06:00
Adam Hill f23ef9b293
switching to circleci 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-12-31 16:53:50 -06:00
Warren Fisher e92dfcfa38 Revert "Update pytest for travisCI" 
This reverts commit fcbe538aa932f7070b655b6ae901670a4216bdef.

Signed-off-by: Warren Fisher <github@warrenfisher.dev>
 2019-11-17 16:33:30 -04:00
Warren Fisher c88f12a351 Update pytest for travisCI 
Signed-off-by: Warren Fisher <github@warrenfisher.dev>
 2019-11-17 16:33:30 -04:00
Warren Fisher 6e38238dc1 Add to Ubuntu install section 
Add info about restarting systemd-resolved

Signed-off-by: Warren Fisher <github@warrenfisher.dev>

Add to Ubuntu install section

Signed-off-by: Warren Fisher <github@warrenfisher.dev>
 2019-11-17 16:33:30 -04:00
Cameron Wilby e74f8c12e4
Update docker-compose.yml 2019-11-12 16:58:04 -08:00
Jeff Billimek 4dffbf031c Add new optional env variable DNS_FQDN_REQUIRED 
This new optional env variable will allow control over the 'Never
forward non-FQDNs' advanced DNS setting.

Signed-off-by: Jeff Billimek <jeff@billimek.com>
 2019-10-16 00:29:40 -04:00
Mitchel Humpherys b5356568d5 docker_run.sh: Add env var to specify storage directory 
Currently `docker_run.sh` bind-mounts some directories rooted at the
working directory when the script is invoked.  Add an environment variable
so that this storage location can be specified at invocation time without
having to change to a different directory.

Also creates PIHOLE_BASE if it doesn't exist already.
 2019-09-30 11:44:40 -07:00
Adam Hill 49ed8a0b2c
Merge pull request #513 from pi-hole/v4.3.2-web 
v4.3.2 web
 2019-09-22 15:03:29 -05:00
Adam Hill 05977b507d
Update install.sh 2019-09-22 13:48:36 -05:00
Adam Hill 7a41d55e61
Merge pull request #504 from kaysond/master 
Update README.md to include detailed Ubuntu install tips
 2019-09-20 21:47:13 -05:00
kaysond e7174adaf1 Update README.md to include detailed Ubuntu install tips 
Signed-off-by: kaysond <kaysond@hotmail.com>
 2019-09-20 18:33:02 -07:00
Adam Hill f38ac6ff0b
Merge pull request #511 from pi-hole/dev 
v4.3.2 + Dev changes
 2019-09-19 23:55:05 -05:00
Adam Hill 17f87be607
wait for returncode 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-09-19 00:07:56 -05:00
Adam Hill 658df9e905
comment cleanup 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-09-17 23:14:12 -05:00
Adam Hill aa31e6baf6
Dockerfile.py now live prints docker build output 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-09-17 23:06:31 -05:00
Adam Hill a6e70b653d
Upgrade 2019-09-17 22:13:12 -05:00
Adam Hill e061deee3e
Merge branch 'master' of github.com:diginc/docker-pi-hole into dev 2019-09-15 20:23:47 -05:00
Adam Hill 79ecb74140
Merge pull request #481 from danielhoherd/patch-1 
Correct inconsistent indentation
 2019-09-01 14:21:07 -05:00
Adam Hill ce2b04e34e
Merge pull request #494 from scottsuch/bugfix/fix_docker_compose_example 
Tweaks to jwilder-proxy.yml
 2019-09-01 14:20:37 -05:00
Adam Hill 1111f81fbf
Merge branch 'master' of github.com:diginc/docker-pi-hole into dev 2019-09-01 11:59:35 -05:00
Adam Hill f057c22649
Merge pull request #498 from ruimarinho/feature/support-additional-env-var-config 
Add support for additional env var config
 2019-08-31 20:48:52 -05:00
Adam Hill f4742240c2
Merge pull request #499 from cclauss/modernize-Python-2-codes 
Use print() function in both Python 2 and Python 3
 2019-08-31 20:46:22 -05:00
Adam Hill 6dcb04d9d6
Merge branch 'master' into modernize-Python-2-codes 2019-08-31 18:48:38 -05:00
Adam Hill dbd8611288
Merge pull request #500 from cclauss/patch-1 
Travis CI: The sudo: tag is deprecated on Travis
 2019-08-31 18:48:28 -05:00
Christian Clauss b135d68b6f
Travis CI: The sudo: tag is deprecated on Travis 2019-08-31 22:09:01 +02: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
Rui Marinho cec9ffb36b Add support for additional env var config 2019-08-31 19:17:19 +01:00
Scott Gorsuch 47298e7f37 Tweaks to jwilder-proxy.yml 
Signed-off-by: Scott Gorsuch <Scott.Gorsuch@blackboard.com>
 2019-08-16 10:27:25 -04:00
Adam Hill c7519e31a2
Merge pull request #492 from alexislefebvre/patch-1 
Fix typo s/equivilent/equivalent/
 2019-08-13 18:38:28 -05:00
Alexis Lefebvre 226d7239e5
Fix typo s/equivilent/equivalent/ 2019-08-12 00:01:42 +02:00
Daniel fa044d0129 Correct inconsistent indentation 
the contents of `volumes` was indented an extra space.

Signed-off-by: Daniel Hoherd <daniel.hoherd@gmail.com>
 2019-07-06 10:09:33 -07:00
Adam Hill 7418b6adee
Merge branch 'master' of github.com:diginc/docker-pi-hole into dev 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-07-02 00:01:06 -05:00
Adam Hill 4eb10fd63a
Merge pull request #480 from pi-hole/v4.3.1-core 
v4.3.1 core
 2019-07-01 23:56:02 -05:00
Adam Hill cee3e47550
v4.3.1 core 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-07-01 22:48:19 -05:00
Adam Hill 7459a75cac
Merge pull request #478 from pi-hole/fix_version_footer 
Fix the footer version
 2019-06-23 13:31:40 -05:00
Adam Hill a2b28d03b8
Fix the footer version 
Resolves #469

Signed-off-by: Adam Hill <adam@diginc.us>
 2019-06-23 12:53:26 -05:00
Adam Hill f226e090fe
Merge pull request #463 from mvaal/jwilder 
Correct formatting issues with docker-compose-jwilder-proxy
 2019-06-07 07:55:21 -05:00
Adam Hill 0cc62575a7
Merge pull request #472 from pi-hole/revert-451-k8s 
Revert 451 k8s

Fixes #465
Fixes #466
Fixes #467
 2019-06-01 16:00:21 -05:00