422 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
Adam Hill	0ecc0c4e67	Create traefik-docker-compose-example.md	2018-03-07 13:07:33 -06:00
Adam Hill	d57159e9ea	Update run	2018-03-07 10:55:49 -06:00
Adam Hill	9d5cc46f30	Should probably get dev working again ... apologies for any issues the default FTL_CMD bug caused	2018-03-06 09:16:32 -06:00
diginc	1c598d3078	adding FTL_CMD for debug	2018-03-01 22:16:38 -06:00
diginc	d83a950a23	update arm version tag	2018-02-22 23:43:07 -06:00
Adam Hill	11ce14d732	Merge pull request #235 from diginc/dev ... v3.3 and other dev branch updates.	2018-02-22 23:42:17 -06:00
Adam Hill	300b2e6901	Merge pull request #234 from diginc/web_port_references_in_php ... Adding fix for #229	2018-02-22 23:23:07 -06:00
diginc	53f766876e	Adding fix for #229 ... * Updates references in /var/www/html to also use WEB_PORT custom HTTP port * Also a deploy script I use for uploading ARM/Multiarch so I stop pulling it out of bash history	2018-02-22 23:11:53 -06:00
Adam Hill	cdcc882d28	Merge pull request #233 from diginc/v3.3 ... v3.3	2018-02-22 11:04:42 -06:00
diginc	f5e83456dd	3.3 tags ahoy	2018-02-21 23:40:27 -06:00
Adam Hill	d5db4f4621	Merge pull request #227 from diginc/use_pihole_checkout ... Use pihole checkout for development checkout	2018-01-31 10:26:38 -06:00
diginc	492b6f6402	add directory for new FTL socket	2018-01-31 10:07:55 -06:00
diginc	b140aeb79d	input yes to continue checkout of dev	2018-01-31 09:25:05 -06:00
Adam Hill	4f93823711	Use pihole checkout for development checkout ... And add FTL	2018-01-30 13:36:57 -06:00
Adam Hill	1f176da47d	Merge pull request #211 from diginc/Installer_patches ... Update install.sh	2018-01-27 00:19:26 -06:00
diginc	45f491ff7b	use dev branches	2018-01-26 23:58:47 -06:00
diginc	a9b41c7099	make the valid IP checks consistent between IPv4 and IPv6	2018-01-26 21:32:39 -06:00
diginc	94f76397fd	remove redundant set -e	2018-01-26 21:25:12 -06:00
diginc	795560f1af	remove CUSTOM_INSTALL	2018-01-26 21:14:30 -06:00
diginc	c42509541d	Merge branch 'Installer_patches' of github.com:diginc/docker-pi-hole into Installer_patches	2018-01-26 21:11:04 -06:00
diginc	91a483614b	updates from PR comments	2018-01-26 21:10:56 -06:00
diginc	e430d5a5e5	switch back to original build	2018-01-26 21:07:25 -06:00
Adam Hill	91481efe48	Merge branch 'dev' into Installer_patches	2018-01-26 19:01:07 -06:00
diginc	c9165850c3	move init to a different name to fix s6-overlay issue #158	2018-01-26 19:00:06 -06:00
diginc	9b7e3998d6	Fix ServerIP v4 validation - error can also be about DNS not being up yet	2018-01-26 18:26:46 -06:00
diginc	39a8802c74	Merge remote-tracking branch 'origin/pr/221' into Installer_patches	2018-01-26 17:36:31 -06:00
Gavin Mogan	b517ecfe6c	Updated template releases	2018-01-26 13:47:20 -08:00
Gavin Mogan	7664a1252f	install procps so pgrep/pkill/etc still exists	2018-01-26 13:46:48 -08:00
Gavin Mogan	47a7419d13	Force non interactive, and only attempt to move systemctl and apt if exist	2018-01-26 13:46:25 -08:00
Gavin Mogan	75fc2771d1	Switch base images to debian stretch	2018-01-26 13:45:15 -08:00
diginc	26733330d5	Merge branch 'Installer_patches' of github.com:diginc/docker-pi-hole into Installer_patches	2018-01-25 12:47:40 -06:00
diginc	4ab2a96552	remove 127.0.0.1 dns as that is supposed to no longer be an issue I think	2018-01-25 12:46:52 -06:00