docker/docker-pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2024-06-27 19:55:14 +02:00
Code Issues Releases Wiki Activity
1,397 Commits 10 Branches 115 Tags 4.7 MiB
1d59f257ff
Commit Graph

1397 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Hill
33c8b1dd18
Merge pull request #204 from diginc/dev 
3.2 To master
 2018-01-05 00:07:28 -06:00
diginc
22c9e81803 latest 3.2 2018-01-04 23:51:30 -06:00
Adam Hill
9d49414fe6
Merge pull request #192 from diginc/3.2_upgrade 
3.2 alpine removed
 2018-01-04 23:37:33 -06:00
diginc
3bcdd27cb9 fix ipv6 test 2018-01-04 22:30:40 -06:00
diginc
c4dc16685a shrink 20-start.sh, merge to start.sh 2018-01-03 22:34:31 -06:00
diginc
c4986cfeff space 2018-01-03 21:37:44 -06:00
diginc
130f50c769 merge dev 2018-01-03 21:37:19 -06:00
diginc
b33ea3b77f fixed the tests 2018-01-03 21:35:53 -06:00
diginc
e5a56222a3 Merge branch '3.2_upgrade' of github.com:diginc/docker-pi-hole into 3.2_upgrade 2018-01-03 20:10:42 -06:00
diginc
615af98eab delete all the alpine 2018-01-03 20:09:47 -06:00
Adam Hill
b12f91983e
Merge pull request #203 from PromoFaux/tweak/Unsupported 
[Untested] Render `pihole -up` inert
 2018-01-03 20:06:24 -06:00
Adam Warner
9ed6bf153c
Inject unsupportedFunc into pihole file, replace reference to updatePiholeFunc 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-01-01 17:18:29 +00:00
Adam Hill
af616f6afc
Merge pull request #194 from thomasleveil/fail-container-if-start-fails 
fail container if s6 20-start.sh scripts fail
 2017-12-12 13:35:54 -06:00
Thomas LEVEIL
9318064061 fail container if start.sh fails 
stop the container whenever start.sh exits with exit status != 0
 2017-12-12 01:01:45 +01:00
diginc
d9fa9b1016 alpine 3.2 startup tests fixed, web still failing 2017-12-11 10:28:15 -06:00
diginc
d47442ee6e alpine fixes: list is OK now, ncures for tput requirement 2017-12-08 00:04:01 -06:00
Adam Hill
ea0a3221de
Merge pull request #191 from diginc/3.2_upgrade 
3.2 upgrade [WIP]
 2017-12-08 00:02:42 -06:00
diginc
7c6c48e133 rest of loading tests fixed, undo heredoc tab2space 2017-12-07 23:39:34 -06:00
diginc
988e17be7a some of the debian_amd64 load_as_expected tests fixed, tab2spaces 2017-12-07 23:30:54 -06:00
diginc
aab0b3f3cb fix debian test_pihole_start_cmd 2017-12-07 20:27:06 -06:00
diginc
6ff1d21f7b New s6 version, remove old list.sh 2017-12-07 19:57:09 -06:00
diginc
563fcbc97b Merge branch 'prerelease' into 3.2_upgrade 2017-12-07 08:52:53 -06:00
Adam Hill
00a8764689
Merge pull request #188 from diginc/dev 
Promote dev patches to master
 2017-12-07 08:44:25 -06:00
Adam Hill
f17dfd0c03
Merge pull request #187 from diginc/prevent_existing_dns_server_override 
Modified DNS server setup to only happen on first boot
 2017-11-19 23:28:35 -06:00
diginc
eb7b0a1fd7 add firstboot marker allow setup of servers if they are passed in but never again 2017-11-19 23:15:44 -06:00
Adam Hill
e484f79e85
Merge pull request #186 from diginc/custom_WEB_PORT_synology 
Custom web port for synology or --net=host users
 2017-11-14 23:09:43 -06:00
diginc
fd4e123ca2 README and small variable update 2017-11-14 22:46:17 -06:00
diginc
50fee7d832 Adding custom web port with tests 2017-11-14 22:33:05 -06:00
diginc
800972856e Added development branch source to test upcoming releases 2017-11-13 20:41:49 -06:00
diginc
5b85323494 Merge branch 'dev' of github.com:diginc/docker-pi-hole into dev 2017-11-05 21:52:22 -06:00
diginc
ecc898af31 Merge branch 'master' of github.com:diginc/docker-pi-hole into dev 2017-11-05 21:52:17 -06:00
Adam Hill
c4dfd83c27
Merge pull request #169 from diginc/tox 
tox + sped up parallel pytest
 2017-11-05 21:51:53 -06:00
diginc
94c90d9b91 comma 2017-11-05 21:30:32 -06:00
diginc
bcfcc85ef3 removed impossible testing combos 2017-11-05 21:30:07 -06:00
Adam Hill
45c25dce2f
Merge pull request #184 from phelma/patch-1 
escape a pipe character which was breaking a table
 2017-11-04 15:37:56 -05:00
Phil Helm
83ef38c8f7
escape a pipe character which was breaking a table 2017-11-02 09:40:09 +00:00
Adam Hill
b778a1dd4d Merge pull request #181 from TonyBrobston/patch-1 
Update README.md
 2017-10-26 17:14:38 -05:00
Adam Hill
92a65df3bb Update README.md 2017-10-26 17:13:15 -05:00
Tony Brobston
ac6e1cdc5a Update README.md 2017-10-26 16:48:35 -05:00
diginc
8886784b2e fix webserver and image 2017-10-18 22:24:22 -05:00
diginc
dded3945f5 switch to dash, update persist to use new style tag 2017-10-18 22:02:23 -05:00
diginc
376af2195d print docker images after building 2017-10-18 21:54:14 -05:00
diginc
fe34280393 new customizable Dockerfile.py and travis matrix 2017-10-18 21:41:23 -05:00
diginc
65f720deeb update testing readme for tox 2017-10-17 00:21:43 -05:00
diginc
7c85ac8d32 Split build out from tests to ensure it runs first 2017-10-16 23:45:39 -05:00
diginc
95dae59418 Merge branch 'dev' of github.com:diginc/docker-pi-hole into tox 2017-10-16 20:09:54 -05:00
diginc
825248fb86 switch alpine nginx hostname to _ 2017-10-16 19:40:59 -05:00
diginc
fda63c8f82 Merge branch 'dev' of github.com:diginc/docker-pi-hole into dev 2017-10-16 19:32:37 -05:00
Adam Hill
e18d0618d9 Merge pull request #176 from ErikMHummel/patch-1 
Minor formatting changes
 2017-10-16 19:22:10 -05:00
Adam Hill
be87bcb6a3 Merge pull request #175 from shaf/dev 
#171,#142 enable DNSSEC for alpine
 2017-10-16 19:17:54 -05:00