c88f12a351
Update pytest for travisCI
...
Signed-off-by: Warren Fisher <github@warrenfisher.dev>
2019-11-17 16:33:30 -04:00
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
e74f8c12e4
Update docker-compose.yml
2019-11-12 16:58:04 -08:00
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
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
49ed8a0b2c
Merge pull request #513 from pi-hole/v4.3.2-web
...
v4.3.2 web
2019-09-22 15:03:29 -05:00
05977b507d
Update install.sh
2019-09-22 13:48:36 -05:00
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
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
f38ac6ff0b
Merge pull request #511 from pi-hole/dev
...
v4.3.2 + Dev changes
2019-09-19 23:55:05 -05:00
17f87be607
wait for returncode
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-09-19 00:07:56 -05:00
658df9e905
comment cleanup
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-09-17 23:14:12 -05:00
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
a6e70b653d
Upgrade
2019-09-17 22:13:12 -05:00
e061deee3e
Merge branch 'master' of github.com:diginc/docker-pi-hole into dev
2019-09-15 20:23:47 -05:00
79ecb74140
Merge pull request #481 from danielhoherd/patch-1
...
Correct inconsistent indentation
2019-09-01 14:21:07 -05:00
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
1111f81fbf
Merge branch 'master' of github.com:diginc/docker-pi-hole into dev
2019-09-01 11:59:35 -05:00
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
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
6dcb04d9d6
Merge branch 'master' into modernize-Python-2-codes
2019-08-31 18:48:38 -05:00
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
b135d68b6f
Travis CI: The sudo: tag is deprecated on Travis
2019-08-31 22:09:01 +02:00
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
cec9ffb36b
Add support for additional env var config
2019-08-31 19:17:19 +01:00
47298e7f37
Tweaks to jwilder-proxy.yml
...
Signed-off-by: Scott Gorsuch <Scott.Gorsuch@blackboard.com>
2019-08-16 10:27:25 -04:00
c7519e31a2
Merge pull request #492 from alexislefebvre/patch-1
...
Fix typo s/equivilent/equivalent/
2019-08-13 18:38:28 -05:00
226d7239e5
Fix typo s/equivilent/equivalent/
2019-08-12 00:01:42 +02:00
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
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
4eb10fd63a
Merge pull request #480 from pi-hole/v4.3.1-core
...
v4.3.1 core
2019-07-01 23:56:02 -05:00
cee3e47550
v4.3.1 core
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-07-01 22:48:19 -05:00
7459a75cac
Merge pull request #478 from pi-hole/fix_version_footer
...
Fix the footer version
2019-06-23 13:31:40 -05:00
a2b28d03b8
Fix the footer version
...
Resolves #469
Signed-off-by: Adam Hill <adam@diginc.us>
2019-06-23 12:53:26 -05:00
f226e090fe
Merge pull request #463 from mvaal/jwilder
...
Correct formatting issues with docker-compose-jwilder-proxy
2019-06-07 07:55:21 -05:00
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
e5a1a26a4a
Merge branch 'master' into revert-451-k8s
2019-06-01 15:40:59 -05:00
89717949c4
Revert "missed test update"
...
This reverts commit 20b130a666
2019-06-01 12:18:10 -05:00
fd48454649
Revert "initial commit on configdir as volume"
...
This reverts commit c1fb17a645
2019-06-01 12:16:14 -05:00
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
8607e26f5e
Merge pull request #453 from itaykomemy/patch-1
...
Fix typo in docker_run.sh
2019-05-30 20:16:52 -05:00
9cf80692d2
Merge pull request #461 from pi-hole/dev
...
Dev image
2019-05-30 20:15:42 -05:00
798a27075c
Merge branch 'master' into patch-1
2019-05-29 18:55:43 -05:00
4b6c41f950
Merge pull request #454 from DistractionRectangle/Trim-docker-image
...
Trim Docker Image
2019-05-29 18:55:29 -05:00
eebb82bb3f
Merge pull request #451 from mabunixda/k8s
...
Use volume for configuration directory
2019-05-29 18:54:59 -05:00
09131ad78f
Merge branch 'master' into k8s
...
* master:
Official tag time
Docker Pi-hole v4.3
2019-05-28 09:15:08 +02:00
7c402d329a
updated
2019-05-28 09:14:21 +02:00
a80868209f
Merge pull request #1 from pi-hole/master
...
update 4.3
2019-05-28 07:11:54 +00:00
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
187ba13f73
Merge pull request #440 from pi-hole/release/v4.3
...
Docker Pi-hole v4.3
2019-05-18 18:36:11 -05:00
Warren Fisher
Warren Fisher
Cameron Wilby
Jeff Billimek
Mitchel Humpherys
Adam Hill
kaysond
Christian Clauss
Rui Marinho
Scott Gorsuch
Alexis Lefebvre
Daniel
Marcus Vaal
Martin Buchleitner
DistractionRectangle