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 |
|
Erik Hummel
|
d8c72ab175
|
Minor formatting changes
Correctly highlight `docker exec` commands in the Pihole features list.
|
2017-10-16 17:13:50 -07:00 |
|
shaf
|
8cfa95f371
|
#171,#142 enable DNSSEC for alpine
|
2017-10-16 23:06:53 +01:00 |
|
Adam Hill
|
43982b6c90
|
Merge pull request #174 from diginc/contribution_guidelines
Create CONTRIBUTING.md
|
2017-10-16 16:10:46 -05:00 |
|
Adam Hill
|
ad884868db
|
Create TESTING.md
|
2017-10-16 15:38:59 -05:00 |
|
Adam Hill
|
30b878f3da
|
Create CONTRIBUTING.md
|
2017-10-16 15:25:40 -05:00 |
|
Adam Hill
|
885ef2d836
|
Merge pull request #173 from diginc/dev
Release latest version to master & mainline tags
|
2017-10-15 22:52:22 -05:00 |
|
Adam Hill
|
e6b175ed27
|
Merge pull request #172 from vidschofelix/patch-1
fix missing newline
|
2017-10-15 22:20:32 -05:00 |
|
vidschofelix
|
499ebe2f8a
|
fix missing newline
|
2017-10-14 14:53:29 +02:00 |
|
Adam Hill
|
4b1b36f74a
|
Merge pull request #170 from mr-bolle/patch-2
update pi-hole to FTL to 2.11.1
|
2017-10-09 20:14:33 -05:00 |
|
mr-bolle
|
bbdf2887e1
|
update pi-hole to FTL to 2.11.1
https://github.com/pi-hole/FTL/releases/tag/v2.11.1
|
2017-10-09 17:13:31 +02:00 |
|
diginc
|
b372f0101d
|
move docker image building to be a global autouse fixture to make sure it runs before tests that use output
|
2017-10-08 12:57:17 -05:00 |
|
diginc
|
8326771570
|
install tox travis
|
2017-10-05 14:30:54 -05:00 |
|
diginc
|
70988c2f10
|
tox + sped up parallel pytest
|
2017-10-05 14:24:30 -05:00 |
|
Adam Hill
|
c0c9114f37
|
Merge pull request #167 from diginc/DockerfileGeneration
Dockerfile generation with template
|
2017-10-05 12:51:35 -05:00 |
|
diginc
|
d98837c828
|
expand most tests to run for all os arch combos
|
2017-10-05 11:59:19 -05:00 |
|
diginc
|
f22ee44226
|
Switch to a single template instead of two, jinja logic
|
2017-10-04 11:05:27 -05:00 |
|
diginc
|
3c6db584d7
|
split out test builds for each arch to help avoid travis timeout
|
2017-10-02 23:46:42 -05:00 |
|
diginc
|
51bebbe4af
|
try setting up qemu for travis build machine to fix red
|
2017-10-02 23:14:03 -05:00 |
|