1
0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2024-06-29 12:41:00 +02:00
Commit Graph

1074 Commits

Author SHA1 Message Date
Adam Warner
ba9d2e54bf
Merge pull request #881 from pi-hole/fix-grav-firstrun
Ignore SKIPGRAVITYONBOOT if gravity.db does not exist
2021-07-21 21:03:16 +01:00
Adam Warner
d13ae118b4
Merge pull request #879 from MichaIng/patch-2
Remove obsolete debconf-apt-progress workaround
2021-07-21 19:54:04 +01:00
Adam Warner
7d82719839
Add note to README
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-07-21 19:45:28 +01:00
Adam Warner
70c573b69e
Ignore SKIPGRAVITYONBOOT if not gravity.db exists, which will be the case if a fresh container is built with a new (empty) volume mapped to it.
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-07-21 19:41:35 +01:00
MichaIng
bd121aa471
@MichaIng Remove obsolete debconf-apt-progress workaround
Since https://github.com/pi-hole/pi-hole/pull/2962 debconf-apt-progress is not used anymore in the basic-install.sh script, making the workaround obsolete.

Signed-off-by: MichaIng <micha@dietpi.com>
2021-07-21 20:16:46 +02:00
Adam Warner
28b5154e52
Include information about nightly/beta tags
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-07-04 22:07:46 +01:00
Adam Warner
918e6b1a21
convert / to - in FTL_VERSION so that image name is valid
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-07-04 21:46:45 +01:00
Adam Warner
9292d8e58a
Merge branch 'master' into dev 2021-07-04 19:01:07 +01:00
Adam Warner
76be304d79
remove #yolo from nightly build yml
add custom build task... (not holding my breath)

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-07-04 18:52:13 +01:00
Adam Warner
0c5ffd72f4
Merge pull request #873 from adyanth/dev
Update README.md to add changes in #867
2021-07-04 14:35:38 +01:00
Adyanth H
3022fa5092 Update README.md to add changes in #867
Signed-off-by: Adyanth H <adyanthh@gmail.com>
2021-07-04 13:09:16 +00:00
Adam Warner
2bc1e9c5cb
Merge pull request #867 from adyanth/dev
Adding CORS_HOSTS to PHP environment
2021-07-04 11:49:42 +01:00
Adyanth H
437e8ddbf5 Change tab to spaces
Signed-off-by: Adyanth H <33192449+adyanth@users.noreply.github.com>
2021-06-16 10:53:28 +05:30
Adyanth H
901ee3d10b Adding CORS_HOSTS to PHP environment
Signed-off-by: Adyanth H <33192449+adyanth@users.noreply.github.com>
2021-06-07 16:01:39 +05:30
Adam Warner
5ed2b9ab2c
Merge pull request #861 from lightswitch05/feature/single-versions-file
Single versions file
2021-06-05 22:01:14 +01:00
Daniel
6b1765c638
Single pihole version file. Added 'python-dotenv' to parse for the VERSIONS file.
Signed-off-by: Daniel <daniel@developerdan.com>
2021-06-04 19:37:28 +00:00
Adam Warner
67b04365c5
Merge pull request #856 from AlexandreRatte/Issue_778
Introduced WEBTHEME environment variable to control user interface theme selection.
2021-06-03 12:03:14 +01:00
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