docker/docker-pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2024-06-26 00:59:07 +02:00
Code Issues Releases Wiki Activity
1,567 Commits 10 Branches 115 Tags 4.7 MiB
e76c382420
Commit Graph

1567 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
RD WebDesign
e76c382420
Replace deprecated variables with the correct ones 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2023-02-13 23:48:14 -03:00
Adam Warner
ab4b7ffff6
Merge pull request #1309 from pi-hole/master 
Sync master back into development
 2023-02-10 19:27:37 +00:00
Adam Warner
113ef002f1
Merge pull request #1317 from pi-hole/dev 
Dev -> Master
 2023-02-10 19:08:46 +00:00
Adam Warner
4debb9da75
Merge pull request #1313 from pi-hole/dependabot/github_actions/dev/docker/build-push-action-4 
Bump docker/build-push-action from 3 to 4
 2023-02-10 19:08:07 +00:00
dependabot[bot]
8fb0344f4c
Bump docker/build-push-action from 3 to 4 
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 3 to 4.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v3...v4)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-04 10:00:30 +00:00
Adam Warner
79f96060b6
Clarify TEMPERATUREUNIT usage 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-01-26 19:39:36 +00:00
Adam Warner
9612689cf2
Merge pull request #1308 from pi-hole/master 
Sync master back into development
 2023-01-25 21:33:28 +00:00
Adam Warner
843b3ff071
Merge pull request #1307 from pi-hole/dev 
Dev -> Master
 2023-01-25 21:28:55 +00:00
Adam Warner
bb33b4d0ab
Merge pull request #1306 from pi-hole/master 
Sync master back into development
 2023-01-25 15:58:19 +00:00
Adam Warner
db6f9b80b5
Update README.md 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-01-25 15:55:41 +00:00
Adam Warner
08cd3ef8f2
Merge pull request #1303 from pi-hole/master 
Sync master back into development
 2023-01-23 23:31:03 +00:00
Adam Warner
3a12526e05
Merge pull request #1304 from pi-hole/virtualhost 
Don't declare VIRTUAL_HOST as an empty string in Dockerfile
 2023-01-23 23:26:29 +00:00
Adam Warner
d7ff34fd74
Instead of including a static config file for redirecting it - dynamically create this file on container start. 
This gets rid of what was probably a hack to have the VIRTUAL_HOST declared as an empty string in the Dockerfile (lighttpd would not start if env.VIRTUAL_HOST was not set

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-01-23 23:20:30 +00:00
Adam Warner
36d0161cf9
Merge pull request #1302 from pi-hole/dev 
Dev-> Master
 2023-01-23 19:01:49 +00:00
Adam Warner
ad6b8a6f0e
Merge pull request #1301 from pi-hole/ln-fallback 
Configure FTL's MACVENDORDB setting to "/macvendor.db" on startup
 2023-01-23 18:00:33 +00:00
Adam Warner
846805aeb7
Configure FTL to use /macvendor.db instead of /etc/pihole/macvendor.db. If user is passing in their own location, then we honour that. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-01-23 17:52:39 +00:00
Adam Warner
2c516ccd7d
Merge pull request #1300 from pi-hole/revert-1298-fix/503 
Revert "Ensure that the directory `/run/lighttpd` exists
 2023-01-23 17:25:35 +00:00
Adam Warner
a1f5c6b530
Revert "Ensure that the directory /run/lighttpd exists, and that it is owned by www-data" 2023-01-23 17:22:54 +00:00
Adam Warner
a8ac8322d5
Merge pull request #1297 from pi-hole/master 
Sync master back into development
 2023-01-22 17:54:04 +00:00
Adam Warner
4256d62a1e
Merge pull request #1298 from pi-hole/fix/503 
Ensure that the directory `/run/lighttpd` exists, and that it is owned by www-data
 2023-01-22 17:53:17 +00:00
Adam Warner
90df84553a
Ensure that the directory /run/lighttpd exists, and that it is owned by www-data. How did this work before?! 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-01-22 17:51:09 +00:00
Adam Warner
c9881798c0
Merge pull request #1296 from pi-hole/dev 
Dev
 2023-01-22 17:23:09 +00:00
Adam Warner
13cdfda3ee
Merge pull request #1293 from n6g7/lighttpd-bind-config 
Add support for changing admin bind address indepentendly of $FTLCONF_LOCAL_IPV4
 2023-01-22 17:22:38 +00:00
Nathan Gaberel
d2637c3a02
Rewrite WEB_PORT log. 
Signed-off-by: Nathan Gaberel <nathan@gnab.fr>
 2023-01-21 18:06:14 -08:00
Nathan Gaberel
010644af5e
Add $WEB_BIND_ADDR to docs. 
Signed-off-by: Nathan Gaberel <nathan@gnab.fr>
 2023-01-21 18:06:14 -08:00
Nathan Gaberel
54d179c24b
Bind lighttpd to $WEB_BIND_ADDR by default. 
Signed-off-by: Nathan Gaberel <nathan@gnab.fr>
 2023-01-21 18:06:05 -08:00
Adam Warner
005b6495ec
Merge pull request #1292 from pi-hole/master 
Sync master back into development
 2023-01-21 14:36:36 +00:00
Adam Warner
b5b7d8aed6
Merge pull request #1291 from pi-hole/dev 
Dev
 2023-01-21 14:27:23 +00:00
Adam Warner
460f65e933
Merge pull request #1290 from pi-hole/provenance 
Disable provenance in the `build-push-action`
 2023-01-21 12:54:21 +00:00
Adam Warner
e6df02c637
Disable provenence per https://github.com/docker/buildx/issues/1513#issuecomment-1398340039 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-01-21 12:39:54 +00:00
Adam Warner
52ee954167
Merge pull request #1288 from pi-hole/allow_empty_ftconf 
Allow for empty strings to be passed into FTLCONF_ environment variables
 2023-01-20 18:26:33 +00:00
Adam Warner
7efb80f988
Allow for empty strings to be passed into FTLCONF_ environment variables. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-01-20 18:22:32 +00:00
Adam Warner
637ce654c5
Merge pull request #1283 from pi-hole/master 
Sync master back into development
 2023-01-18 23:08:30 +00:00
Adam Warner
3be4ac6b5a
Merge pull request #1287 from pi-hole/dev 
Dev-> master
 2023-01-18 23:07:45 +00:00
Adam Warner
312419b33b
Merge pull request #1286 from pi-hole/fix/duplicate_env 
lighttpd does not like it if VIRTUAL_HOST and FTLCONF_LOCAL_IPV4 are duplicate values...
 2023-01-18 22:42:31 +00:00
Adam Warner
cbf5d6620c
lighttpd does not like it if VIRTUAL_HOST and FTLCONF_LOCAL_IPV4 are the same value - but that makes sense. Instead we set VIRTUAL_HOST to HOSTNAME if it is not already set by the user 
Also goes back to making the modifications to 15-pihole-admin.conf in conf-available - as otherwise it overwrites the symlink. Not a big deal, but I think we got confused earlier on

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-01-18 22:41:54 +00:00
Adam Warner
6b13b9bae9
Merge pull request #1285 from pi-hole/dev 
Dev
 2023-01-18 17:50:19 +00:00
Adam Warner
671f988b45
Merge pull request #1284 from pi-hole/remove-PHP_ENV_CONFIG_var 
Modify the `15-pihole-admin.conf` file in the correct path....
 2023-01-18 17:49:55 +00:00
Adam Warner
d588dba28e
Modify the 15-pihole-admin.conf file in the correct path. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-01-18 17:47:40 +00:00
Adam Warner
5e3555dc6a
Merge pull request #1282 from pi-hole/dev 
Dev
 2023-01-18 16:21:18 +00:00
Adam Warner
b96b257be1
Merge pull request #1281 from pi-hole/remove-PHP_ENV_CONFIG_var 
Remove the PHP_ENV_CONFIG variable from the Dockerfile
 2023-01-18 15:36:14 +00:00
Adam Warner
61bd3c756a
I don't know why PHP_ENV_CONFIG is an environment variable. We don't need it to be 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-01-18 15:26:29 +00:00
Adam Warner
91161b7ec6
Merge pull request #1278 from pi-hole/master 
Sync master back into development
 2023-01-17 09:18:42 +00:00
Adam Warner
f70e9b37b8
Add note about external.conf, tidy up the upgrade notes section 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-01-17 09:14:49 +00:00
Adam Warner
3b29a79f9d
Merge pull request #1272 from pi-hole/master 
Sync master back into development
 2023-01-15 23:56:07 +00:00
Adam Warner
45d5fa753a
Merge pull request #1271 from pi-hole/admin-page-redirect 
[Docker Only] Configure lighttpd to redirect http://VIRTUAL_HOST or http://FTLCONF_LOCAL_IPV4 to /admin
 2023-01-15 23:55:08 +00:00
Adam Warner
4c240a43d2
Introduce an additional lighttpd config file to redirect the IP address and VIRTUAL_HOST to /admin/ 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-01-15 23:48:34 +00:00
Adam Warner
2c04346411
Merge pull request #1269 from pi-hole/fix/PHP_ENV_CONFIG 
Change `PHP_ENV_CONFIG` and `setup_web_php_env()`
 2023-01-15 20:55:01 +00:00
RD WebDesign
8872c2b393
Fix config filename on the test 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2023-01-15 17:50:28 -03:00
RD WebDesign
a58b1c08bd Change PHP_ENV_CONFIG and setup_web_php_env() 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2023-01-15 17:12:05 -03:00