Commit Graph

1750 Commits

Author SHA1 Message Date
diginc c7245a6787 Bumping pi-hole to 2.8.1 2016-07-15 22:47:42 -05:00
Adam Hill b3f436ef4a README cron section update 2016-07-10 23:32:32 -05:00
Adam Hill 629478f050 Merge pull request #18 from diginc/dev
Release pi-hole v2.7.1 and web fork
2016-07-09 23:24:12 -05:00
diginc 302d370dab Updating the AdminLTE version to stop alerting about updates 2016-07-09 23:07:50 -05:00
diginc d8b43ae9d5 If users don't set VHOST, pass ServerIP to it for fixing Docker0 NAT CORS problem #16 2016-07-08 08:25:38 -05:00
Adam Hill 681d79fd65 Merge pull request #17 from diginc/logging_and_refactor_CORS
Working whitelist / blacklist in docker containers.
2016-07-08 08:10:59 -05:00
diginc f67e3367c5 point git submodule to AdminLTE fork 2016-07-08 07:55:38 -05:00
diginc e3d9b472cb PATH for /usr/local was missing for php-fpm 2016-07-08 07:43:47 -05:00
diginc d2f7043f2b Various changed to docker to make CORS happy and customizable 2016-07-07 23:34:41 -05:00
diginc 492638fca2 php whitelist/blacklist still not quite working but closer 2016-07-07 00:19:39 -05:00
diginc 8722f786be php whitelist/blacklist still not quite working but closer 2016-06-16 00:10:14 -05:00
Adam Hill aea49bce99 Merge pull request #14 from diginc/update_2.7_pi_1.3_admin
New versions, php5-openssl added for new GUI white/blacklist
2016-06-15 23:26:11 -05:00
diginc 2df6e3d683 New versions, php5-openssl added for new GUI white/blacklist 2016-06-15 23:27:16 -05:00
Adam Hill 123a64311c Merge pull request #13 from diginc/pihole_script_fix_cron_and_readme
Pihole script fix cron and readme
2016-05-24 22:10:36 -05:00
diginc cb266e3946 update to version 2.6.3 2016-05-24 22:04:22 -05:00
diginc ad6d4d79d0 fixed crontab script 2016-05-24 21:55:36 -05:00
diginc 61968fd77a fix the php version, and start locally tagging with the same tags as hub to ease testing w/o unique testing tags 2016-05-12 16:44:20 -05:00
diginc 69887e5366 WIP readme and cron changes 2016-05-11 10:41:06 -05:00
diginc e02f4bd837 updated example environment variables and documentation I missed 2016-04-26 07:46:27 -05:00
diginc 08f49d3ffa Merge pull request #11 from diginc/2.6.2_update
Updated version, support for custom DNS server override env vars
2016-04-25 23:25:54 -05:00
diginc b0011d0a46 Updated version, support for custom DNS server override env vars 2016-04-25 23:18:41 -05:00
diginc a7052c89b2 Update README.md 2016-04-13 20:30:28 -07:00
diginc 0b106ea4de docker-compose example updated
* updated IP address to match in extra hosts
* point jwilder/proxy users to readme for more info
* comment default volumes since that is more advanced funcionality
2016-03-30 15:24:47 -05:00
diginc 212f4fc70a Travis build status image 2016-03-30 14:29:58 -05:00
diginc 48e4368b40 Merge pull request #9 from diginc/travis
Travis ci build
2016-03-30 14:15:08 -05:00
diginc 2ffebdb2ad first attempt at travis build 2016-03-29 22:04:36 -05:00
diginc 75a12c3a82 Merge pull request #8 from diginc/add_webui_versions
Version in the web interfaces works now! (various)
2016-03-29 19:53:11 -05:00
diginc eeb7b84f5a Version in the web interfaces works now! (various)
* Added version files, updated by the submodule updater script
* Modify the php of adminLTE to read said version files
* Fixed env in the dockerfiles
2016-03-29 19:51:08 -05:00
diginc e9412e7190 adding another docker compose example based off my setup, making sure doco examples are all using the latest environment variable for piholeIP (host ip) 2016-03-28 21:42:11 -05:00
diginc 831477dda0 Merge pull request #7 from diginc/Fix_ad_ip_addresses
adding docker host IP pass in for dnsmasq to use for ads
2016-03-28 09:25:09 -05:00
diginc 8587027453 adding docker host IP pass in for dnsmasq to use for ads 2016-03-28 09:23:37 -05:00
diginc fcf3bf7762 updating to latest code for AdminLTE & pi-hole 2016-03-26 12:31:39 -05:00
diginc 78415b6cdd updating upstream submodules 2016-03-05 22:48:48 -06:00
diginc 6e8979976e switch to pihole upstream submodule / not fork 2016-02-24 09:02:47 -06:00
diginc a1f1a63c2d Update alpine, added helper script to assist CI/automated updates in future 2016-02-24 07:27:50 -06:00
diginc 8d19efc135 update upstream hashes 2016-02-24 07:19:58 -06:00
diginc 9c9dd9e982 fix % of todays traffic by intalling bc 2016-02-14 11:50:33 -06:00
diginc 2a969e4d0d updates regarding debian/scripts inside container 2016-02-13 20:02:51 -06:00
diginc 0593e8d5e8 clarify this is x86 only for now 2016-02-13 19:33:53 -06:00
diginc f8f2d64c41 fixing up readme 2016-02-13 19:21:57 -06:00
diginc 46fb7b0ab1 fixing revered link markdown in readme 2016-02-13 18:57:52 -06:00
diginc d4811fc773 fixing revered link markdown in readme 2016-02-13 18:55:32 -06:00
diginc 3a76b44733 Merge pull request #1 from diginc/readme
Readme
2016-02-13 18:36:30 -06:00
diginc 6c36d8ba93 detailed readme 2016-02-13 18:33:01 -06:00
diginc 551d7e3744 detailed readme 2016-02-13 18:29:55 -06:00
diginc e88e75ac3d updating to the latest upstream pihole code 2016-02-13 16:11:04 -06:00
diginc adc40218e1 correct the submodule git type 2016-02-13 14:29:19 -06:00
diginc 2cfb144fe5 start split for each OS directory to keep debian functional 2016-02-13 13:28:10 -06:00
diginc 972a6c3c39 alpine nginx pihole working, weighing in at 85.36 MB vs debian 252.4 MB 2016-02-13 13:24:44 -06:00
diginc 94ef971f71 initial version of monolithic debian docker & WIP alpine.
* Submodules of pi-hole source for copying into docker images
 * git submodules...yuk.
* debian builds and runs pi-hole apps/configs on jessie docker
 * useful base line for merge and testing upstream updates
 * Linux x86/64 image, would like to try raspian ARM docker image base too
* WIP alpine dockerfile
 * will need more custom lighttpd config(s) at a minimum
 * again there is an ARM alpine version so running on pi is future possibility
2016-02-01 22:58:09 -06:00