Commit Graph

276 Commits

Author SHA1 Message Date
Adam Warner 292a6b961c
Update Dockerfile to use a nifty buildkit feature allowing us to either pull FTL from the web, or use a locally built copy.
Add a build script for ease of local building (separate from the build-and-test script).
Update Readme with build instructions

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2024-03-16 01:56:35 +00:00
Adam Warner 24006c7a00
Address comments.
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2024-03-11 18:14:26 +00:00
Adam Warner 9fefa11c41
Tidy up a few things in the readme and code.
Check that pihole-FTL is configured with upstream servers or it will not function!

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2024-03-10 19:29:38 +00:00
Adam Warner 23fe63dff6
Get rid of the SKIPGRAVITYONBOOT environment variable. Instead, only run gravity on a fresh volume if the gravity database does not exist. There isn't really any need for gravity to be updated on every start (current default behaviour)
This will still run the gravity migration scripts on every boot if the gravity database exists

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-11-03 14:22:43 +00:00
Adam Warner 9928cfa630
Clarify delimter for array type FTLCONF_ values
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-10-29 17:48:24 +00:00
Adam Warner ae90e9c854
Trim some fat
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-10-22 22:14:29 +01:00
Adam Warner bb2a7b1153
Update README.md
Co-authored-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
2023-10-22 17:42:29 +01:00
Adam Warner 74657d01a9
- Bring back the logic from v5 containers for web password
- Update readme to take into accounts changes to FTLs environment variable handling
- shell/md linting, tidy away some code that is no longer needed

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-10-22 17:42:27 +01:00
Adam Warner 0784964f60
This is all now handled natively in FTL, no need for the bash
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-10-20 11:39:28 +01:00
Adam Warner 6fa1759814
AdminLTE -> web
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-10-08 14:06:35 +01:00
Adam Warner 4c2d0ab34f
Add valid args
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-09-27 18:14:45 +01:00
Adam Warner 7011839026
Add some information about building a custom image with an alternative component branch
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-09-27 18:08:51 +01:00
Adam Warner b893784c09
Update README.md
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
2023-09-25 17:27:16 +01:00
Adam Warner 3ca2aea41c
Add documentation
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-09-21 00:03:25 +01:00
Adam Warner 48970d8bb7
Quick first pass of Readme update. Probably still needs more work. Can happen as we go
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-09-10 17:13:33 +01:00
Adam Warner 4ec50469c7
!!!BREAKING!!! Use this as an oppurtunity to tidy up/uniform the environment variables. Most things can be set directly in pihole.toml these days, so will convert variables in the format of FTLCONF_key or FTLCONF_key_subkey etc into key or key.subkey respectively and apply them to the config
This also takes away a lot of the error handling - but that should likely be in FTL if anywhere, anyway. Vastly simplifies startup in docker

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-02-10 23:01:19 +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 db6f9b80b5
Update README.md
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-01-25 15:55:41 +00: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
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 3fe6b9e750
Add a clarifyier to docker compose command, remove the -f, as it is not needed
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-01-02 19:00:41 +00:00
Adam Warner 41ac2b3aa8
Update README to explain the version numbers slightly more accurately
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-11-30 22:38:31 +00:00
David Gatti 7f8862d73f
Added -d option for detach. 2022-11-05 14:39:27 +01:00
David Gatti 069a88b7d1
Update README.md
Added the working command for Docker 2

Signed-off-by: David Gatti <dawid@gatti.io>
2022-11-05 08:50:04 +01:00
Julio Hurtado Gómez 47fe743548
Delete duplicate "that"
Signed-off-by: Julio Hurtado Gómez <kloner88@gmail.com>
2022-10-04 10:14:30 +02:00
LaboDJ 540ca1e31f Remove the email function
It was removed from pi-hole in 5.12 by this PR https://github.com/pi-hole/pi-hole/pull/4870

Signed-off-by: LaboDJ <2527836+labodj@users.noreply.github.com>
2022-09-03 05:31:11 +02:00
Adam Warner f044e58b5c
Calrifications to experimental uid/gid changer variables
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-09-02 23:58:53 +01:00
Adam Warner 9d17bd9871
Update documentation per comments on #1155
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-09-02 18:14:10 +01:00
Adam Warner de80425c87
Merge pull request #1168 from freddydumont/patch-1
Add systemd-resolved note for Fedora
2022-09-02 18:09:56 +01:00
Adam Warner 10c33ed871
Add note to readme about installingon Dokku, closes #1190
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-29 14:32:14 +01:00
Adam Warner cb38190b50
FTLCONF_REPLY_ADDR4/6 are now deprecated. Use FTLCONF_LOCAL_IPV4/6 instead
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-22 21:42:29 +01:00
Frédérick Morin 31cd4fbc47
Add systemd-resolved note for Fedora
Fedora 33+ enables [systemd-resolved by default](https://fedoraproject.org/wiki/Changes/systemd-resolved), so the "Installing on Ubuntu" section becomes relevant for Fedora users as well.

This small change makes it possible to search the Readme for "Fedora" and find the solution instantly.

Signed-off-by: Frédérick Morin <freddydumont@users.noreply.github.com>
2022-08-15 16:46:25 -04:00
TJ Zimmerman 40224be544 Add missing backticks to Exp. Vars for formatting. 2022-08-01 00:10:51 -07:00
Adam Warner 2c963a0f01
update example paths in readme 2022-07-15 17:46:33 +01:00
Adam Warner 611df9b3f0
Huge tidy up/prune/refactor of the code
- Moves most code in start.sh into functions in bash_functions.sh
- Removes code from 20-start.sh and moves it inside start.sh
- Removes unused variables and code, making it easier to find our way around
- Removes dependency on webpage.sh, which had to be modified in order to source it properly (thus breaking pihole checkout), use utils.sh instead
- Replaces all uses of ServerIP/v6 with new FTLCONF_REPLY_ADDR4/6 variables
- No need to symlink echo to whiptail any more (probably hasn't been needed for a while)
- removes huge list of exported env vars at the top of start.sh - no longer appear to be needed
- rename some functions in bash_functions to more logical names, group their usages in start.sh
- adjust/fix tests to match changes
- remove some dead tests

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-07-11 23:50:05 +01:00
Adam Warner afdb7a110d
Merge pull request #1125 from pi-hole/master
sync: master to dev
2022-07-03 19:28:36 +01:00
Dan Schaper bb99fae517
Update README.md
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2022-07-01 13:05:11 -07:00
mmvanheusden 60e252c414
Remove random tab in the readme 2022-06-07 16:06:15 +02:00
Adam Warner 8cedb5b030
Merge pull request #1082 from canepan/patch-2
Update README.md to mention minimum required docker version
2022-05-23 17:16:54 +01:00
Adam Warner 0e7013e890
Update README.md 2022-05-23 17:15:47 +01:00
Daniel 6e36311d6f
Update README.md to describe the current docker tagging pattern 2022-05-02 22:49:08 -04:00
canepan 3d27c94595
Update README.md
Signed-off-by: Nicola Canepa <nicola.canepa.74@gmail.com>
Mention the required update to docker.io in additon to libseccomp2 on ARM
2022-05-02 06:20:30 +01:00
Adam Warner 89480b1e9d
Expand on information about libseccomp
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-04-25 17:42:35 +01:00
Adam Warner e1dc289d7d
Fix suggested spelling mistakes
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-04-22 17:41:29 +01:00
Adam Warner f6d6a31743
Merge pull request #1060 from pi-hole/master
sync: master to dev
2022-04-12 17:29:34 +01:00
Adam Warner f3260fb0f9
Update README.md 2022-04-12 17:28:10 +01:00
Adam Warner 4b9e142d54
Update README.md 2022-04-12 17:26:55 +01:00
Jasper Vandemalle 95f0eeea00
Fix minor typos in README 2022-04-08 11:37:11 +02:00
Adam Warner c1ea9dac8c
Update README.md 2022-04-04 21:01:09 +01:00
Adam Warner f6947f1497
Add some additonal upgrade notes to the readme, and a note on using watchtower
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-04-04 18:58:32 +01:00