docker
/
docker-pi-hole
mirror of https://github.com/pi-hole/docker-pi-hole.git
1
0
Fork 0
Code Issues Releases Wiki Activity
868 Commits 10 Branches 114 Tags 4.7 MiB
Commit Graph

868 Commits

Author SHA1 Message Date
diginc 49bae4f0cd Merge branch 'dev' of github.com:diginc/docker-pi-hole into add_missing_indecies 2016-08-28 00:46:11 -05:00
diginc 3b74e8d3e3 Tests working again, along with persistent tests with an actual running pi-hole container 2016-08-28 00:45:26 -05:00
Adam Hill c0f0ca119b Merge pull request #30 from soredake/dev 
armhf support
 2016-08-27 16:26:43 -05:00
name c6bcc0f87e armhf support 2016-08-27 21:07:04 +03:00
Adam Hill 952757257a Merge pull request #29 from diginc/badges_fixed 
Badges updated
 2016-08-25 15:23:11 -05:00
Adam Hill a145e8d60b Badges updated 2016-08-25 14:09:02 -05:00
Adam Hill 782fb27559 Merge pull request #27 from diginc/pytest_params 
Refactor testinfra docker to support parametrize
 2016-08-02 23:41:06 -05:00
diginc d40ee18689 Refactor testinfra docker to support parametrize 
This accomplishes the same thing as the previous tests, without using testinfra docker's boilerplate example, which had some drawbacks: Adding @parametrize to the previous version didn't allow overriding the pytest.mark docker arg, image:tag, or cmd with a parametrized test containing different expected results associated with either the alpine/debian tag.  Isntead it'd run all the parameters against both tags...e.g. nginx and lighttpd test would run agains both alpine and docker when parametizing on the test level.
 2016-08-02 23:32:51 -05:00
Adam Hill a7fae0f5e2 Merge pull request #24 from gitter-badger/gitter-badge 
Add a Gitter chat badge to README.md
 2016-07-22 15:08:31 -05:00
The Gitter Badger 44807d26f3 Add Gitter badge 2016-07-22 19:39:14 +00:00
diginc e801bfb5ba probably only need python 2.7 2016-07-18 12:12:25 -05:00
diginc 1e5a8a2762 can I mix docker with python? 2016-07-18 11:17:50 -05:00
diginc b41dd1bf8c py.test now builds containers, travis py.test 
* Instead of using the docker_dev, py.test builds and runs containers
* Travis-CI hopefully can run these same tests on PR/Merges now
 2016-07-18 10:44:55 -05:00
Adam Hill fae728415f Merge pull request #21 from diginc/dev 
Release dev branch work to master
 2016-07-16 16:06:46 -05:00
diginc 4225e4cd7c remove a few unecessary lines 2016-07-16 16:02:49 -05:00
diginc d2024cda37 Merge branch 'dev' of github.com:diginc/docker-pi-hole into dev 2016-07-16 16:00:52 -05:00
diginc b3879c8729 Fix to debian lighttpd php config #19 w/tests 2016-07-16 16:00:20 -05:00
Adam Hill 1ff52f72b3 Merge pull request #20 from diginc/release_2.8.1 
Bumping pi-hole to 2.8.1
 2016-07-15 22:50:57 -05:00
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