1
0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2024-06-26 00:59:07 +02:00
Commit Graph

991 Commits

Author SHA1 Message Date
Kyle Kurz
f53015157d
Issue #824 - Don't log password (#825)
When setting the password, explicitly disable bash logging. Leave the
re-enable code so that other functions work as expected. Additionally,
do not remove the print in generate_password so randomly generated
passwords are still logged for user consistency.

Signed-off-by: Kyle Kurz <kyle@doublekaudio.com>
2021-04-14 17:13:01 +01:00
Adam Warner
190844d0b0
remove no longer required code (#736)
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-04-14 14:36:55 +01:00
Adam Warner
6532390647
Only set one PIHOLE_DNS_ entry in the install script (#826)
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-04-13 19:09:40 +01:00
Daniel
26aea62e22
Added new Debian version: bullseye (#828)
Signed-off-by: Daniel <daniel@developerdan.com>
2021-04-13 18:09:31 +01:00
Adam Warner
c0e55c156f
Remove port 443 from templates and documentation. (Redo) (#808)
* Update docker_run.sh

* Update docker-compose.yml.example

* Update README.md

* Update Dockerfile

Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
2021-02-26 20:09:31 +00:00
Adam Warner
6d9913e824
Merge pull request #807 from pi-hole/master
Master -> Dev
2021-02-26 19:44:48 +00:00
Dan Schaper
20cd9c3abf
Merge pull request #803 from pi-hole/fix/GH_IssueTemplate2
Add required front matter to bug report template.
2021-02-18 13:05:53 -08:00
Dan Schaper
e6307df638
Add required front matter to bug report template. 2021-02-18 12:56:33 -08:00
Dan Schaper
14f6262491
Merge pull request #800 from pi-hole/fix/issue_templates
Override default issue templates
2021-02-18 12:50:21 -08:00
Dan Schaper
bcd9ad5157
Copy default config.yml
From the docs:

> If a repository has any files in its own .github/ISSUE_TEMPLATE folder, including issue templates or a config.yml file, none of the contents of the default .github/ISSUE_TEMPLATE folder will be used.

So we need to copy the config.yml since it will be ignored.
2021-02-18 10:25:05 -08:00
Dan Schaper
6e1e93112d
Override default issue templates 2021-02-18 10:17:40 -08:00
Adam Warner
5acc88ef86
Merge pull request #798 from pi-hole/master
sync master back to dev
2021-02-17 00:12:15 +00:00
Adam Warner
8d57c8ce7b
Merge pull request #797 from pi-hole/dev
Dev -> master
2021-02-16 23:31:34 +00:00
Adam Warner
ea7f659874
Merge branch 'master' into dev 2021-02-16 23:17:52 +00:00
Adam Warner
abdf9f1130
remove shared memory files before starting the FTL process. Mimics bare metal service script (to an extent) (#796)
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-02-16 23:09:49 +00:00
Adam Warner
75328c63f8
Merge pull request #793 from pi-hole/dev
Release 5.7
2021-02-16 20:19:25 +00:00
Adam Warner
3f0a7d85b1
bump web version
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-02-16 19:50:09 +00:00
Adam Warner
c5484e6a85
Merge pull request #792 from optimusprime01/devel
fixing typos in ReadMe
2021-02-16 09:15:31 +00:00
Sachin Sunder Sagadevan
dad930f9d2 fixing typos in ReadMe
Signed-off-by: Sachin Sunder Sagadevan <sachsun2809@outlook.com>
2021-02-15 20:25:12 -08:00
Adam Warner
b39f53d12e
Merge pull request #790 from Sounie/documentation-tidy-ups
Couple of typos in docs.
2021-02-12 20:34:45 +00:00
Stephen Souness
a51f69bef9 Couple of typos in docs. 2021-02-12 19:23:55 +00:00
Adam Warner
0669b0fe91
Merge pull request #786 from loehden/dev
Changed description of the DNSMASQ_LISTENING environment variable in README.md
2021-02-10 18:55:48 +00:00
Adam Warner
3d42c16217
Merge pull request #787 from pi-hole/new/falseErrors
Fixing errors with regexfile and chmod/chown [Alt]
2021-02-10 18:04:38 +00:00
Adam Warner
6b6ba9b458
accidentally a reference
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-02-10 17:46:09 +00:00
Tyler Spires
c23b1d6894
forgot to remove the dhcp.leases from the original line.
Signed-off-by: Tyler Spires <shadrach145@gmail.com>
2021-02-10 17:31:47 +00:00
Tyler Spires
29cf35b2c5
Fixing error with dhcp.leases too.
Signed-off-by: Tyler Spires <shadrach145@gmail.com>
2021-02-10 17:31:33 +00:00
Adam Warner
8cf36e6f7e
Remove chmod of no longer used file
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-02-10 17:31:31 +00:00
Benjamin Löhden
7adccc0287 Update README.md
Signed-off-by: Benjamin Löhden <3964467+loehden@users.noreply.github.com>
2021-02-09 00:17:28 +01:00
Adam Warner
7c135f5ce8
Merge pull request #777 from pi-hole/master
master->dev
2021-01-27 18:38:37 +00:00
Adam Warner
79ead80720
Merge pull request #776 from pi-hole/dev
v5.6 Release
2021-01-27 18:34:45 +00:00
Adam Warner
302924a3e2
Merge branch 'master' into dev 2021-01-27 18:16:33 +00:00
Adam Warner
0a8d174ef7
prep for new release 2021-01-27 18:11:32 +00:00
Adam Warner
5735495ec7
Merge pull request #771 from MichaIng/patch-2
Skip full distro check on start
2021-01-27 17:42:58 +00:00
MichaIng
512f610afa Skip full distro check on start
The distro_check function includes updating the APT cache, checking for dependencies, which is both not required on Docker start where all required packages are installed already. The only required steps from this function is the webserver user and config file names, which can be applied directly instead since we know that the Pi-hole Docker container is based on Debian.

Furthermore this solves the issue that updating the APT cache fails, when Pi-hole itself is used for DNS resolution, since pihole-FTL has not yet been started at this stage. That failure was not visible since "apt-get update" does not exist with error code (currently) when facing DNS resolving issues, even if not a single list could have been updated, and no other step is done that would require DNS resolving, until pihole-FTL is started. For a regular (non-Docker) install or update it is however reasonable to error out directly when the APT cache could not have been updated, to not defer the exit unnecessarily to a harder-to-debug stage.

Signed-off-by: MichaIng <micha@dietpi.com>
2021-01-24 15:14:18 +01:00
Adam Warner
4902b4cc6a
Merge pull request #765 from pi-hole/dev
Release 5.5
2021-01-19 12:55:39 +00:00
Adam Warner
0f618ffc31
bump core and web version numbers
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-01-19 12:41:46 +00:00
Adam Warner
91fd3933aa
Merge pull request #761 from pi-hole/master
Master back into Dev
2021-01-16 20:28:22 +00:00
Adam Warner
c75ca906e7
Merge pull request #760 from pi-hole/fix/latest-tag
Use Location: header for GitHub API call for latest tag detection.
2021-01-16 20:07:19 +00:00
Dan Schaper
494667c85d
Use Location: header for GitHub API call
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2021-01-16 11:45:26 -08:00
Adam Hill
9bcd8e163a
Merge pull request #758 from pi-hole/dev
Latest versions to master
2021-01-16 09:13:07 -06:00
Adam Warner
b154947cb9
Merge branch 'master' into dev 2021-01-16 13:05:57 +00:00
Adam Warner
1d35a336b4
Merge pull request #754 from pi-hole/fix/query_logging
Ensure that QUERY_LOGGING value is persisted between container runs
2021-01-16 12:34:29 +00:00
Adam Warner
0d9fc510cf
Merge pull request #757 from pi-hole/release-prep
Prepare for new release
2021-01-16 12:34:02 +00:00
Adam Warner
1aefa3b063
bump core and web version numbers (we _have_ to find a better way!)
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-01-15 20:42:32 +00:00
Adam Warner
39090babf5
Ensure that QUERY_LOGGING value is persisted between container runs
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-01-09 21:45:17 +00:00
Adam Warner
5c21f146f4
Merge pull request #741 from pi-hole/dev
v5.2.2 and various to master
2020-12-25 00:04:17 +00:00
Adam Hill
99b6dc9503
Merge pull request #740 from pi-hole/release-prep
Bump Version number to latest Pi-hole Core
2020-12-24 13:56:51 -06:00
Adam Warner
a445507627
Bump to latest Pi-hole core version (web is at the same version currently)
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-12-24 11:20:32 +00:00
Adam Warner
f445660079
Merge pull request #739 from shaderecker/typos
Fix typo in cronjob comment
2020-12-23 19:02:44 +00:00
Adam Warner
c0bf6c91f6
Merge pull request #738 from shaderecker/docu
Documentation updates
2020-12-23 18:58:34 +00:00