1
0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2024-06-26 00:59:07 +02:00
Commit Graph

903 Commits

Author SHA1 Message Date
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
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
cb463d01d2 Fix default block list install
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
Mathieu Hofman
138e061c17 Allow running pihole-FTL as non-root
- Add a new container environment variable allowing to specify the user to run the pihole-FTL process as. Defaults to root.
- Set inherited capabilities attributes on the pihole-FTL file to automatically grant runtime permitted capabilities when available in the bounding set. This allows dropping root before starting pihole-FTL without failing with a permission error if the capabilities are not available to the container (the process may still error out if performing an operation requiring the capability).
- Add some information on capabilities to the Readme file.

Signed-off-by: Mathieu Hofman <86499+mhofman@users.noreply.github.com>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
2019-05-09 16:50:18 +02:00
Adam Hill
b72da80f13 hotfix for bad grep
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
3de08b138e change to calling it dnsmasq user
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
040d9fcee6 v4.2.1 & more robust user root fix
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
f7f6949c53 run FTL as root
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
Martin Buchleitner
c1fb17a645 initial commit on configdir as volume
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
2019-05-08 08:12:58 +02:00
Adam Hill
e3f42c86f3
Merge branch 'master' into release/v4.3 2019-04-29 21:38:05 -05:00
Adam Hill
cf36276d21
Merge pull request #447 from pi-hole/ServerIP-net-host
Update README.md
2019-04-24 14:02:12 -05:00
Adam Hill
7d36ab2ff9
Update README.md 2019-04-24 13:39:44 -05:00
Adam Hill
5f8b01bce3
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.
2019-04-24 13:37:45 -05:00
Adam Hill
346213415d
Merge pull request #442 from poldim/patch-1
Fix typo
2019-04-15 12:02:23 -05:00
DK
2a973474fd
Fix typo
Pretty sure 54 is a typo and should be 53.
2019-04-15 09:06:29 -07:00