Commit Graph

868 Commits

Author SHA1 Message Date
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
diginc 097f280c9b red test 2016-11-01 22:32:36 -05:00
diginc eddba93537 split out the bash function tests to own file 2016-10-31 23:42:08 -05:00
diginc 99c4921a84 common_start.sh now bash_functions.sh, dnsmasq test clarified 2016-10-30 13:47:06 -05:00
Adam Hill c524927bb1 Merge pull request #64 from diginc/2.9.5
latest version of pi-hole/web, refactor, fixes
2016-10-30 13:42:33 -05:00
diginc 7325ae336c switch tabs to spaces where allowed 2016-10-30 12:25:08 -05:00
diginc cb66d578a5 start needs correct permissions 2016-10-30 12:19:42 -05:00
diginc 73f7dd7636 update debian arm to user unified start.sh 2016-10-30 12:19:05 -05:00
diginc 6a1d16d6fb latest version of pi-hole/web, refactor, fixes 2016-10-30 12:13:52 -05:00
Adam Hill 2d5e69879a Merge pull request #62 from diginc/dev
Dev Test additions
2016-10-22 13:59:15 -05:00
diginc 6c721163e6 fixing shellcheck errors from master 2016-10-22 13:39:12 -05:00
diginc 7465c0b064 Merge branch 'master' of github.com:diginc/docker-pi-hole into dev
Conflicts:
	common_start.sh
2016-10-22 13:13:11 -05:00
Adam Hill 746f0be2e7 Update README.md 2016-10-22 12:29:28 -05:00
Adam Hill f38fa10dd5 Merge pull request #61 from diginc/1.9.4
Pi-hole and Web versions update + new stuff
2016-10-21 09:29:45 -05:00
diginc e5d09d476b clarify 2016-10-20 23:13:34 -05:00
diginc 4e7554b545 Adding a section about upgrading 2016-10-20 23:12:20 -05:00
diginc c9468eaabd Pi-hole and Web versions update + new stuff
* New code in shell scripts required killing systemctl in images
* Added tests for the quick IPv6 env hack I made a while back
* Stopped requiring the need for update.sh to copy gravity for alpine
 * (moved modifications to dockerfile)
* One step closer to unified start script for both OS versions
* Optimzed some test code
2016-10-20 22:44:44 -05:00
Adam Hill a4ff8df02c Merge pull request #58 from diginc/shellcheck
Shellcheck
2016-10-08 15:29:08 -05:00
diginc ff77abf228 Merge branch 'dev' of github.com:diginc/docker-pi-hole into shellcheck 2016-10-08 15:13:45 -05:00
Adam Hill c81d09dc88 Merge pull request #57 from diginc/master
update dev from master release / bug fixes
2016-10-08 15:11:43 -05:00
diginc 21eee5a0ca Shellcheck added to py.test and fixes
- Various minor quote fixes
- Optimized repeated echos into php conf for alpine
2016-10-08 14:56:06 -05:00
Adam Hill beb364dfce Merge pull request #56 from diginc/fix_dns_env_vars
fixes #55 DNS1 & DNS2 bug
2016-10-08 13:48:56 -05:00
diginc 34419c5631 do not need these prints any more 2016-10-08 13:40:36 -05:00
diginc 61da6ce0ad fixes #55 DNS1 & DNS2 bug
- tests now watch for regression in these ENV var's behavior
- use local scope in function instead of exported for easier testing
2016-10-08 13:34:25 -05:00
Adam Hill cf42873171 Merge pull request #54 from diginc/pihole1.9.2
Pihole 1.9.2 dockerized
2016-10-07 12:54:19 -05:00
diginc b3df863a08 add in all the changes from upstream 1.9.2 post release 2016-10-07 12:39:41 -05:00
diginc 6e7d879fe1 Improve cron disclaimer about updating pihole p2
- previous commit was the result of this change woops
- Point users towards the docker method of updating in the cron, rather than internal software updates
2016-10-07 12:38:44 -05:00
diginc 18cebd264a comment about tini not being used for arm 2016-10-07 12:38:11 -05:00
diginc 3c8d5b97e6 Improve cron disclaimer about updating pihole
- Point users towards the docker method of updating in the cron, rather than internal software updates
2016-10-07 12:37:17 -05:00
diginc e7a7dcb4e6 config test: now uses exit on error. style changes. 2016-10-07 12:14:12 -05:00
diginc d15c4a287f Remove redundant dnsmasq start command for alpine
- redundant dnsmasq start just shows up in the log, didn't hurt anything
- I previously update.sh replaced commenting out the service start with the alpine style startup command
2016-10-07 12:13:02 -05:00