docker/docker-pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2024-06-29 12:41:00 +02:00
Code Issues Releases Wiki Activity
145 Commits 10 Branches 115 Tags 4.7 MiB
c524927bb1
Commit Graph

145 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
diginc
2f0ed7e368 remove unused arm start script (same as debian start) 2016-10-06 19:47:07 -05:00
diginc
6407aab65b refactor to reduce duplication in scripts 2016-10-06 19:46:27 -05:00
diginc
822903189c Fixing issues with 1.9.2 
- Case on IPv4addr was incorrect, gravity now requires it instead of piholeIP file
- debian:jessie no longer had dnsutils dig?  odd.
- py.test always pull the latest docker images to help reveal base image changes like above
- py.test stubbing of gravity was acciently not present in debian arm's start.sh
- pihole submodule using development branch latest
 2016-10-06 18:51:05 -05:00
Adam Hill
e8b32168b6 Merge pull request #53 from diginc/dev 
Release dev fixes to prod
 2016-10-05 22:11:41 -05:00
Adam Hill
966715ac4d Merge pull request #52 from diginc/2_issue_fixes 
Fix issues 50 and 51
 2016-10-05 21:57:15 -05:00
diginc
ee2949aba8 entrypoint start script modifications for issues 
- piholeIPv6 in setupVars.txt fixes #50
- firstboot multipel runs fixes #51
 - really only necessary for debian, but I like symmetry in the start files
 2016-10-05 21:55:08 -05:00
Adam Hill
5f6c599302 Merge pull request #48 from diginc/web1.4.2 
bumping the admin web version
 2016-10-01 11:05:56 -05:00
diginc
9dfe6dc83e bumping the admin web version 2016-10-01 11:01:35 -05:00
Adam Hill
dccf17b23c Merge pull request #47 from diginc/dev 
Web v1.4.1
 2016-09-25 21:27:38 -05:00
diginc
393576ce62 Web v1.4.1 2016-09-25 21:11:20 -05:00
Adam Hill
5a3f96fae0 Merge pull request #46 from diginc/dev 
Release 2.9.1
 2016-09-24 00:30:36 -05:00
Adam Hill
eaeef80aed Update README.md 2016-09-24 00:30:01 -05:00
diginc
3c1861b7bd 2.9.1 2016-09-23 22:42:29 -05:00
Adam Hill
4855c2f6b6 Merge pull request #45 from diginc/dev 
Releasing ARM debian image tag
 2016-09-23 21:56:46 -05:00
diginc
66cb3a7d52 Merge branch 'dev' of github.com:diginc/docker-pi-hole into dev 2016-09-23 21:24:22 -05:00
diginc
8910dadfb2 updating the docker compose examples 2016-09-23 21:24:14 -05:00
Adam Hill
07ca2662fb Update README.md 2016-09-23 21:17:52 -05:00
Adam Hill
126eea4108 Update README.md 
Fixup the docker tags section some more
 2016-09-23 20:21:21 -05:00
diginc
db5b1c72eb added ARM tag to docs, update to readme and run script 2016-09-23 20:13:08 -05:00
diginc
2c704addaf Merge branch 'master' of github.com:diginc/docker-pi-hole into dev 2016-09-23 18:59:43 -05:00
Adam Hill
c9a28117c9 Update README.md 2016-09-23 08:41:38 -05:00
Adam Hill
cbf293e268 Merge pull request #42 from bgulla/bgulla-patch-1 
Corrected spelling errors on README
 2016-09-09 11:21:36 -05:00
Brandon
658dce811a Corrected spelling errors on README 2016-09-09 08:48:04 -04:00