454 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Adam Hill	bb3885a15b	Update the deploy arm to work...better	2018-07-12 11:34:47 -05:00
Adam Hill	e14b742649	Merge branch 'dev' of github.com:diginc/docker-pi-hole into prerelease	2018-07-12 11:12:27 -05:00
Adam Hill	f770df9504	Merge pull request #293 from diginc/more_ports ... More ports	2018-07-11 14:04:40 -05:00
diginc	89a556f858	add ports to jwilder example	2018-07-10 23:31:04 -05:00
diginc	bd925db871	add ports to basic doco example	2018-07-10 23:25:13 -05:00
diginc	10f948fca0	adding ports to traefik example	2018-07-10 23:22:39 -05:00
diginc	70acf54c2c	Merge branch 'dev' of github.com:diginc/docker-pi-hole into prerelease	2018-07-10 23:16:40 -05:00
diginc	1b96d7e760	Merge branch 'dev' of github.com:diginc/docker-pi-hole into more_ports	2018-07-10 23:14:27 -05:00
Adam Hill	3afc1d43ff	Merge pull request #290 from StefanSchoof/SingleDns ... allow no for DNS2	2018-07-10 23:14:19 -05:00
diginc	6364640d4f	readme updates	2018-07-10 23:11:44 -05:00
diginc	1a30cb7e7b	ports for QNAP and other expose metadata utilizing things	2018-07-10 21:56:59 -05:00
StefanSchoof	3171feef4c	allow no for DNS2	2018-07-06 08:01:41 +00:00
diginc	cd6f2790bd	Merge branch 'dev' of github.com:diginc/docker-pi-hole into dev	2018-07-05 20:51:20 -05:00
diginc	3877a171da	fix startup 53 port conflict and test error	2018-07-04 14:11:18 -05:00
diginc	ad6b4be403	Fixes to the startup, services, and dnsmasq references	2018-07-03 00:19:01 -05:00
diginc	041ef30d42	Merge remote-tracking branch 'origin/dev' into prerelease	2018-07-02 20:50:51 -05:00
diginc	d45bccf9b4	remove dnsmasq service for new pihole-FTL service	2018-07-02 20:50:31 -05:00
Adam Hill	3a4cf40473	Merge pull request #287 from StefanSchoof/failOnError ... Fail container on error in start.sh	2018-07-02 14:13:45 -05:00
StefanSchoof	002c8349d2	remove extra set from debugging	2018-07-02 18:18:01 +00:00
StefanSchoof	4ff219b5b8	Fail container on error in start.sh	2018-07-02 11:45:39 +00:00
diginc	60bd77f586	Add in install option for FTLDNS	2018-06-30 17:16:16 -05:00
diginc	3bf7992e52	Merge branch 'master' of github.com:diginc/docker-pi-hole into dev	2018-06-30 11:38:10 -05:00
Adam Hill	6eabd15cd1	Merge pull request #285 from alefchak/dev ... Fixed malformed lighthttpd.conf when using host networking and setting WEB_PORT. Fixes #247	2018-06-23 12:16:48 -05:00
Andrew Lefchak	af1816b7e5	Fixed malformed lighthttpd.conf when using host networking and setting WEB_PORT. Fixes #247	2018-06-23 00:04:08 -04:00
Adam Hill	8e2889ba56	Merge pull request #270 from nxadm/master ... typo	2018-05-08 16:36:46 -05:00
Claudio Ramirez	d12a876f8f	typo	2018-05-08 21:07:50 +02:00
Adam Hill	a050918a5f	Merge pull request #269 from nxadm/master ... Safe workaround for slow loading pages (scripts that make SSL connections to blocked domains)	2018-05-08 11:53:31 -05:00
Claudio Ramirez	e10a200d70	fmt	2018-05-04 17:17:53 +02:00
Claudio Ramirez	17b3781dd4	Safe workaround for slow loading pages (scripts that make SSL connections to blocked domains)	2018-05-04 17:16:49 +02:00
Adam Hill	9948388656	Merge pull request #266 from diginc/fix_ipv6_lookup ... fix IP V6 lookup	2018-04-24 19:44:52 -05:00
Adam Hill	aaad7c8981	Update README.md	2018-04-21 12:47:22 -05:00
Adam Hill	225332b977	fix_ipv6_lookup ... Forgot to add the lookup fix from https://github.com/diginc/docker-pi-hole/issues/199#issuecomment-372462890	2018-04-21 12:42:13 -05:00
Adam Hill	a51261ae16	Merge pull request #263 from Raqbit/dev ... Fix docker-compose.yml symlink	2018-04-12 11:30:38 -05:00
Raqbit	6813831883	Fix docker-compose.yml symlink	2018-04-12 17:06:39 +02:00
Adam Hill	3295474f79	Merge pull request #258 from diginc/dev ... Move FTL_CMD to dockerfile	2018-04-10 12:38:09 -05:00
diginc	45a196d9c4	Move FTL_CMD to dockerfile	2018-04-10 12:33:25 -05:00
Adam Hill	76d6a67d48	Merge pull request #237 from diginc/dev ... Develoment to Master	2018-04-10 10:36:38 -05:00
Adam Hill	fed2f7f4d3	Update start.sh	2018-04-10 10:07:23 -05:00
Adam Hill	024571b123	Merge pull request #256 from bobsoppe/master ... Update pi-hole core to v3.3.1	2018-04-10 08:35:44 -05:00
Bob Soppe	b08ce657fc	Update pi-hole core to v3.3.1	2018-04-06 13:59:24 +02:00
Adam Hill	84b03e0a17	Merge pull request #253 from tedder/patch-2 ... quick readability edits	2018-04-05 14:59:52 -05:00
Adam Hill	bc54868f80	Merge branch 'master' into patch-2	2018-04-05 14:58:41 -05:00
Adam Hill	cf8cc9a4d0	Merge pull request #254 from tedder/patch-3 ... copyedit, round two	2018-04-05 14:58:12 -05:00
Ted Timmons	d8fdd4bacc	copyedit, round two ... more copyedits.	2018-04-05 09:42:24 -07:00
Ted Timmons	9bb4a2daf5	quick readability edits ... lots of spelling fixes, add a second header so it doesn't blend together	2018-04-05 09:19:54 -07:00
Adam Hill	d4c42b8c13	Merge pull request #246 from diginc/github_templates ... Create github templates	2018-03-20 15:05:04 -05:00
Adam Hill	89b6b2a75e	Create PULL_REQUEST_TEMPLATE.md	2018-03-20 10:07:20 -05:00
Adam Hill	156679c925	Create ISSUE_TEMPLATE.md	2018-03-19 17:47:15 -05:00
Adam Hill	c0ba5ad7ca	Merge pull request #240 from diginc/traefik ... Create traefik-docker-compose-example.md	2018-03-19 13:25:39 -05:00
Adam Hill	bcbb509842	Update traefik-docker-compose-example.md	2018-03-07 13:18:32 -06:00