Walter Treur
746399ce4b
Ensured setupVars.conf is always present when changing settings from start.sh
2017-01-21 16:03:08 -05:00
diginc
4f1fb5ec01
Revert "re-enable arm as part of testing".
...
This reverts commit 14f7654549
.
docker cloud runs a build for arm now and travis-ci times out on arm building through qemu.
2017-01-18 20:30:10 -06:00
Adam Hill
35a282b45d
Merge pull request #91 from diginc/master
...
update dev with latest master release code
2017-01-18 20:25:12 -06:00
Adam Hill
69e5164215
Merge pull request #89 from soredake/links
...
links update
2017-01-18 09:57:16 -06:00
Adam Hill
2a2530d5f3
Merge pull request #84 from diginc/v2.11.1
...
V2.11.1+ update - from github official repo & installer rather than sub modules.
2017-01-18 08:52:59 -06:00
diginc
52a0764d57
remove other submodule related files
2017-01-17 23:17:45 -06:00
diginc
9dfa187ae2
remove submodules
2017-01-17 23:16:11 -06:00
diginc
14f7654549
re-enable arm as part of testing
2017-01-17 23:13:24 -06:00
diginc
4f37f2a130
move nginx php rule from admin/ only to /
2017-01-17 23:12:24 -06:00
diginc
5404d6124f
re-do a few things to fix up test/handle updated code
2017-01-17 22:49:42 -06:00
diginc
73c054cbc5
runing as sh breaks tests, override testinfra
2017-01-17 22:48:59 -06:00
diginc
eedea6526a
pytest error go away
2017-01-17 22:48:25 -06:00
soredake
aa94d74aab
links update
2017-01-13 23:51:33 +02:00
diginc
d528878bac
test passing...travis virtual environment is another story
2017-01-11 20:12:56 -06:00
diginc
5138e3ba3b
Merge branch 'v2.11.1' of github.com:diginc/docker-pi-hole into v2.11.1
2017-01-11 19:38:45 -06:00
Adam Hill
b13abe038e
Merge pull request #87 from jaltek/patch-1
...
Fixed some typos
2017-01-11 10:03:22 -06:00
Jan
7a761c5dcb
Fixed some typos
2017-01-11 16:15:52 +01:00
diginc
9f20dcc708
disabled real adlists by default
2017-01-10 22:58:27 -06:00
diginc
136f43a995
various test fixes
2017-01-10 20:38:42 -06:00
Adam Hill
2a973ed0e1
Merge pull request #83 from mattkenn4545/feature/remove-interface-from-runs
...
Use ip route to determine IP
2017-01-09 12:09:43 -06:00
Adam Hill
15446df061
Update docker_dev.sh
2017-01-09 12:05:40 -06:00
Adam Hill
8d90235580
Update docker_run.sh
2017-01-09 12:04:32 -06:00
Adam Hill
25c3739a0c
Update README.md
2017-01-09 12:03:01 -06:00
Adam Hill
ce49b19ade
Merge pull request #82 from mattkenn4545/feature/dns-is-important
...
Ensure DNS is available early
2017-01-09 10:42:38 -06:00
diginc
cc1c7a745d
resolving alpine+nginx issues
2017-01-08 23:43:12 -06:00
diginc
dc83502ed1
alpine builds! tests next
2017-01-08 19:13:25 -06:00
diginc
2e6ff703a2
Merge branch 'master' of github.com:diginc/docker-pi-hole into v2.11.1
2017-01-08 11:13:51 -06:00
diginc
2bf5f4ce00
latest versions
2017-01-08 10:54:18 -06:00
diginc
ef96fbc809
debian images building, alpine WIP
2017-01-08 10:42:39 -06:00
Matthew Kennedy
0477dea085
Fix tests
2017-01-07 22:36:31 -07:00
Matthew Kennedy
472b98894e
Use ip route to determine IP
2017-01-07 22:16:29 -07:00
Matthew Kennedy
0d87eaeb58
DNS is important! Dnsmasq should come up early and not rely on gravity update.
2017-01-07 21:51:12 -07:00
Adam Hill
28d4b777e2
Merge pull request #77 from chriscrowley/dev
...
Fixed typo
2016-12-14 09:29:14 -06:00
Chris Crowley
988d8132db
Fixed typo
2016-12-14 10:07:22 -05:00
Adam Hill
6c90bab0cf
Fix #75
...
remove .cron from cron.d file since extensions aren't supported.
2016-12-05 16:43:40 -06:00
Adam Hill
19617a7d0d
Merge pull request #73 from diginc/tini_update
...
Tini update and arm version
2016-11-12 20:02:52 -06:00
diginc
5301dfcb39
Tini update and arm version
...
* Noticed:
* tini arm is out! Go ARM TINI - thanks @krallin
* tini alpine is behind on 0.9 - grabed latest the same way as debians
* Redundent run steps between requirements and tini, merged
* inconsistency in dockerfiles, made consistent
* I kept writing noticed in front of all these items, used nesting instead
2016-11-12 18:08:38 -06:00
Adam Hill
cb66d9ac02
Merge pull request #71 from diginc/dev
...
Release bugfix for Alpine tag disable / enable
2016-11-06 20:16:04 -06:00
Adam Hill
a8000c3278
Merge pull request #70 from diginc/alpine_enable_disable
...
Alpine enable disable
2016-11-06 19:21:28 -06:00
diginc
f9bb0c976a
add pihole enable/disable tests
2016-11-06 15:12:11 -06:00
diginc
8efa6790f2
somehow I didn't have the latest master commit for pi-hole
2016-11-06 13:43:59 -06:00
diginc
22b9053993
adding alpine service
replacement commands
2016-11-06 13:42:38 -06:00
diginc
f6006e09d5
add test for pihole scripts, restartDNS first test
2016-11-06 13:41:43 -06:00
diginc
a6020cbfa5
Fix alpine web log follow error
2016-11-06 13:41:14 -06:00
diginc
6ec264e3b6
rename/clarify test and move RunningPiHole to global py.test scope
2016-11-06 13:40:24 -06:00
Adam Hill
879f39c52d
Merge pull request #68 from diginc/dev
...
Dev release to master
2016-11-05 18:43:59 -05:00
Adam Hill
981a62eb26
Merge pull request #67 from diginc/diginc-patch-1
...
Upgrade instructions update
2016-11-05 13:29:09 -05:00
Adam Hill
429a1d685d
Update README.md
...
Clarified readme updgrade instructions to address #60
2016-11-05 13:14:39 -05:00
Adam Hill
d5844553a8
Merge pull request #66 from diginc/more_bash_function_tests
...
More bash function tests
2016-11-05 12:50:04 -05:00
diginc
afa0f89096
Fixing setup_php_env (Green)
2016-11-01 22:46:29 -05:00