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
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
Adam Hill e5a1a26a4a
Merge branch 'master' into revert-451-k8s 2019-06-01 15:40:59 -05:00
Adam Hill 89717949c4
Revert "missed test update" 
This reverts commit 20b130a666.
 2019-06-01 12:18:10 -05:00
Adam Hill fd48454649
Revert "initial commit on configdir as volume" 
This reverts commit c1fb17a645.

Signed-off-by: Adam Hill <adam@diginc.us>
 2019-06-01 12:16:14 -05:00
Marcus Vaal 8fe0d7231e Correct formatting issues with docker-compose-jwilder-proxy 
Signed-off-by: Marcus Vaal <mjvaal@gmail.com>
 2019-05-30 21:34:25 -05:00
Adam Hill 8607e26f5e
Merge pull request #453 from itaykomemy/patch-1 
Fix typo in docker_run.sh
 2019-05-30 20:16:52 -05:00
Adam Hill 9cf80692d2
Merge pull request #461 from pi-hole/dev 
Dev image
 2019-05-30 20:15:42 -05:00
Adam Hill 798a27075c
Merge branch 'master' into patch-1 2019-05-29 18:55:43 -05:00
Adam Hill 4b6c41f950
Merge pull request #454 from DistractionRectangle/Trim-docker-image 
Trim Docker Image
 2019-05-29 18:55:29 -05:00
Adam Hill eebb82bb3f
Merge pull request #451 from mabunixda/k8s 
Use volume for configuration directory
 2019-05-29 18:54:59 -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 a80868209f
Merge pull request #1 from pi-hole/master 
update 4.3
 2019-05-28 07:11:54 +00:00
DistractionRectangle 113da00d0a Update install.sh 
Shallow clone pihole and webinterface repos to target branch.
Only install curl and procps dependencies, as well as
ca-certificates for curl'ing against https

Cuts image size down by ~30MB (304MB -> 274MB)

Signed-off-by: DistractionRectangle <48034372+DistractionRectangle@users.noreply.github.com>
 2019-05-19 19:19:24 -07:00
Adam Hill 187ba13f73
Merge pull request #440 from pi-hole/release/v4.3 
Docker Pi-hole v4.3
 2019-05-18 18:36:11 -05:00
Adam Hill 874c4b757b
Official tag time 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-05-18 18:25:19 -05:00
Itay Komemy 3d76736421
Update docker_run.sh 2019-05-12 23:52:50 +03:00
Martin Buchleitner 20b130a666 missed test update 
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Martin Buchleitner 5eab0a9730 initial commit on configdir as volume 
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill 23f7feff20 Update README.md 
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill c7adfe432a Update README.md 
Clarify that people running --net=host should set ServerIP for Pi-hole to function correctly.

I'll have to try to add some automation around this later to try to warn only the network host mode users if they miss it.

Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
DK 4f85381d8c Fix typo 
Pretty sure 54 is a typo and should be 53.

Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill d8cf7df70b Update README.md 
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill c08698c11a Release v4.2.2 
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 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 41289bdd58 No v6 default or validation of the env breaks for non v6 enabled computers 
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 de74f56e87 A bunch of readme tweaks 
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