Commit Graph

1107 Commits

Author SHA1 Message Date
Alexandre Ratte 2484c9ced2 Merge branch 'dev' of https://github.com/AlexandreRatte/docker-pi-hole into Issue_778
Signed-off-by: Alexandre Ratte <alexandre.ratte@gmail.com>
2021-05-15 08:38:43 -04:00
Alexandre Ratte c4caf293f7 Amended comment.
Signed-off-by: Alexandre Ratte <alexandre.ratte@gmail.com>
2021-05-15 08:34:09 -04:00
Alexandre Ratte d0c152eb25 Documented WEBTHEME environment variable.
Signed-off-by: Alexandre Ratte <alexandre.ratte@gmail.com>
2021-05-15 08:31:24 -04:00
Alexandre Ratte 995ec08608 Changed invalid WEBTHEME value's fallback theme to default-light, to stay inline with pi-hole's default.
Signed-off-by: Alexandre Ratte <alexandre.ratte@gmail.com>
2021-05-15 08:31:24 -04:00
Alexandre Ratte 504f3bac3b Added WEBTHEME parsing.
Signed-off-by: Alexandre Ratte <alexandre.ratte@gmail.com>
2021-05-15 08:31:24 -04:00
Adam Warner 99de0dce83
Merge pull request #689 from jparenas/cache_size
Add CACHE_SIZE environment variable to the available options
2021-05-12 20:50:45 +01:00
Adam Warner 58d2c6a934
[skip ci] Merge branch 'master' into dev 2021-05-12 20:24:11 +01:00
Adam Warner 0954c9f3dd
[skip ci] remove buster from builds for now - they are not currently functional.
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-05-12 20:23:51 +01:00
Adam Warner c436a8a053
Merge branch 'master' into dev 2021-05-12 20:15:28 +01:00
Adam Warner 3acf505a1a
[skip ci] Update multi-arch nightly build script, too. 2021-05-12 20:14:52 +01:00
Adam Warner 60063a81fd
[Skip CI] Change nightly time from every 5 mins to 2am 2021-05-12 19:23:10 +01:00
Adam Warner 4963578fb5
Update nightly-experiment.yml 2021-05-12 18:45:55 +01:00
Adam Warner e64b1d0c0a
Create nightly-experiment.yml 2021-05-12 18:35:38 +01:00
jparenas 73378d1231 Add CUSTOM_CACHE_SIZE environment variable to the available options
Signed-off-by: jparenas <juan.p.arenas1@gmail.com>
2021-05-08 16:11:57 -05:00
Adam Warner 47c15eb65d
Merge pull request #843 from pi-hole/install-overhaul
`install.sh` overhaul
2021-05-08 15:19:57 +01:00
Adam Warner fcd002d507
Merge pull request #853 from lightswitch05/task/resync-dev-with-master
Resync dev with master
2021-05-04 15:50:00 +01:00
Daniel bd343fc3da Merge branch 'master' of github.com:pi-hole/docker-pi-hole into task/resync-dev-with-master 2021-05-04 14:10:41 +00:00
dependabot[bot] 1f46ed4cbe
Merge pull request #848 from pi-hole/dependabot/pip/cryptography-3.3.2 2021-05-03 23:08:02 +00:00
dependabot[bot] 3db66a66fa
Bump cryptography from 2.8 to 3.3.2
Bumps [cryptography](https://github.com/pyca/cryptography) from 2.8 to 3.3.2.
- [Release notes](https://github.com/pyca/cryptography/releases)
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pyca/cryptography/compare/2.8...3.3.2)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-03 22:45:32 +00:00
Daniel 622294a7a1
Merge pull request #846 from pi-hole/dependabot/pip/py-1.10.0 2021-05-03 18:40:35 -04:00
dependabot[bot] 70ae3baf75
Bump py from 1.8.1 to 1.10.0
Bumps [py](https://github.com/pytest-dev/py) from 1.8.1 to 1.10.0.
- [Release notes](https://github.com/pytest-dev/py/releases)
- [Changelog](https://github.com/pytest-dev/py/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/py/compare/1.8.1...1.10.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-03 22:26:00 +00:00
Daniel 2b270c75b7
Merge pull request #845 from pi-hole/dependabot/pip/pyyaml-5.4 2021-05-03 18:21:02 -04:00
dependabot[bot] 1ff3d7a5fc
Bump pyyaml from 5.2 to 5.4
Bumps [pyyaml](https://github.com/yaml/pyyaml) from 5.2 to 5.4.
- [Release notes](https://github.com/yaml/pyyaml/releases)
- [Changelog](https://github.com/yaml/pyyaml/blob/master/CHANGES)
- [Commits](https://github.com/yaml/pyyaml/compare/5.2...5.4)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-03 22:02:20 +00:00
dependabot[bot] 35b5c80408
Merge pull request #847 from pi-hole/dependabot/pip/jinja2-2.11.3 2021-05-03 21:57:19 +00:00
dependabot[bot] 59e177525a
Bump jinja2 from 2.10.3 to 2.11.3
Bumps [jinja2](https://github.com/pallets/jinja) from 2.10.3 to 2.11.3.
- [Release notes](https://github.com/pallets/jinja/releases)
- [Changelog](https://github.com/pallets/jinja/blob/master/CHANGES.rst)
- [Commits](https://github.com/pallets/jinja/compare/2.10.3...2.11.3)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-03 21:41:28 +00:00
dependabot[bot] 27135f263f
Merge pull request #850 from pi-hole/dependabot/pip/urllib3-1.25.8 2021-05-03 21:36:19 +00:00
Adam Warner ac444c44f2
Update install.sh
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-05-03 15:25:26 +01:00
Adam Warner 96408f91a7
Merge pull request #849 from matthewbeckler/dev
Add note regarding changing Pi-hole DNS setting when using docker bridge networking
2021-05-01 00:29:37 +01:00
Adam Warner 151d588c4c
Update VERSIONS
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
2021-05-01 00:24:37 +01:00
dependabot[bot] 071b169896
Bump urllib3 from 1.25.7 to 1.25.8
Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.25.7 to 1.25.8.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst)
- [Commits](https://github.com/urllib3/urllib3/compare/1.25.7...1.25.8)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-30 22:04:12 +00:00
Matthew Beckler f9c51379b0 Add note regarding changing Pi-hole DNS setting when using docker bridge networking 2021-04-29 14:42:50 -05:00
Adam Warner 42f1fa3380
Wrong conditional...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-04-19 23:20:58 +01:00
Adam Warner 5ca1dbf35f
Massive overhaul of `install.sh based on how I test fresh installs of differing branches/tags
First git clone the repos, next checkout the relevant branches and finally run the install script. Simples.
`sed`ed out a couple of other unsupported functions

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-04-19 23:06:00 +01:00
Adam Warner ebe72b45e4
Merge pull request #737 from shaderecker/symlink
Remove broken doco-example.yml symlink
2021-04-19 14:54:52 +01:00
Adam Warner c36d6ae501
Merge pull request #842 from pi-hole/master
master->dev
2021-04-19 09:52:40 +01:00
Adam Warner 2e04f5abee
Add upgrade note for v.58 2021-04-19 09:38:15 +01:00
Adam Warner 17f6ef8e56
Merge pull request #837 from pi-hole/dev
Release 5.8 - "Third time's the charm" edition
2021-04-17 18:23:33 +01:00
Adam Warner c9a3ac0df1
Merge pull request #818 from static-void-main/dev
Add support for the i386 architecture
2021-04-17 17:17:57 +01:00
Adam Warner 784be64178
Merge pull request #839 from pi-hole/tweak/valid_ip
Check for validity of values passed in through `PIHOLE_DNS_`
2021-04-17 11:17:25 +01:00
Adam Warner 82ef6544a4
Merge pull request #840 from pi-hole/revert-743-docker-hostname
Revert "Add `hostname` to docker-compose"
2021-04-17 00:54:31 +01:00
Adam Warner 59c08f36ee
Revert "Add `hostname` to docker-compose" 2021-04-17 00:53:51 +01:00
Adam Warner dba2317072
Merge pull request #769 from ignic/dhcp_setup
Enable DHCP Server with environment variables
2021-04-16 23:45:43 +01:00
Adam Warner 4b7c35be7e
Merge pull request #743 from e2jk/docker-hostname
Add `hostname` to docker-compose
2021-04-16 23:31:56 +01:00
Adam Warner f6b9716a75
Additionally, exit script if 0 valid entries are detected
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-04-16 23:19:58 +01:00
Adam Warner 14e3bcb480
Check for validity of values passed in through `PIHOLE_DNS_` Throw away junk.
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-04-16 22:56:09 +01:00
Adam Warner e88429a65d
Merge branch 'dev' of github.com:pi-hole/docker-pi-hole into dev 2021-04-16 21:56:13 +01:00
Adam Warner 4f531d9e78
Irrelevant since IP blocking is no longer the default method.
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-04-16 21:55:55 +01:00
Adam Warner 87c99a0b8c
Merge pull request #823 from limes007/master
Make test of IPv6 env variable case insensitive
2021-04-16 19:40:25 +01:00
Adam Warner 6f865b1699
Remove some out of date info about not remapping port 80.
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-04-16 18:40:47 +01:00
Adam Warner ba6f7f9d62
remove Upgrade notices section. It's old, and there isn't really anything relevant in there any more. 2021-04-16 18:33:01 +01:00