docker
/
docker-pi-hole
mirror of https://github.com/pi-hole/docker-pi-hole.git
1
0
Fork 0
Code Issues Releases Wiki Activity
1,193 Commits 9 Branches 114 Tags 4.5 MiB
Commit Graph

1193 Commits

Author SHA1 Message Date
Sebastian Sterk 3d6f53899f
make prerequisites more precise 2022-02-01 00:17:59 +01:00
Adam Warner 69d4349bbb
Create dco.yml 2022-01-28 10:19:44 +00:00
Adam Warner 1d51da7f47
Create release.yml 2022-01-28 10:18:50 +00:00
Adam Warner 351b9a7f85
Create sync-back-to-dev.yml 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-28 10:18:16 +00:00
Adam Warner 19bb9dcc2f
use label `stale` on stale issues instead of `Submitter attention required`, which doesn't always make sense 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-28 10:15:49 +00:00
Adam Warner 13a3da65c8
Update stale.yml 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-12 09:17:26 +00:00
Adam Warner b901a899ae
add never-stale and bug labels to exemptions 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-11 19:11:51 +00:00
Adam Warner 6e9790870c
Use stale action from core repo to manage stale issues 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-08 17:18:04 +00:00
Adam Warner 0baf7b63d9
Merge pull request #976 from pi-hole/new/bullseye 
Switch base image from Buster to Bullseye
 2022-01-08 13:40:45 +00:00
Adam Warner 5e79db52ab
This does not appear to be an issue on bullseye - tested with the same command's listed here https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=923479, but switched out buster for bullseye. Confirmed I was able to repro the buster issue on docker desktop for windows 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-08 13:26:11 +00:00
Adam Warner 0018e46a28
Bullseye anyone? 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-08 12:55:54 +00:00
Adam Warner 25a8e0dcba
Merge pull request #970 from AlexanderLieret/patch-webtheme 
Update list of available web themes
 2022-01-07 23:46:07 +00:00
Adam Warner 74707b576c
Merge pull request #973 from pi-hole/tweak/serviceMonkeyPatch 
Prevent logspam when restarting FTL (Error from kill command)
 2022-01-07 23:20:42 +00:00
Adam Warner 9deb685cc0
When restarting the service - wait until the old proc has been killed before attempting to start it again. Prevents messages about the usuage of kill in the log. 
Remove old comment

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-07 23:14:28 +00:00
Alexander Lieret 28892f4533
Update list of available web themes 
Signed-off-by: Alexander Lieret <alexander.lieret@fau.de>
 2022-01-06 17:16:04 +01:00
Adam Warner 4cc3587084
adjustment to custom interface tests to reflect new default behaviour in https://github.com/pi-hole/pi-hole/pull/4509 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-05 22:47:16 +00:00
Adam Warner 2567ab9940
only chown/chmod pihole-FTL.db if it exists 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-05 21:47:25 +00:00
Adam Warner 6b29503dd0
Tweak fix_capabilites output 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-05 19:37:13 +00:00
Adam Warner 806f734cdc
Remove shim now that it is in the core repo https://github.com/pi-hole/pi-hole/pull/4515 (#965) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-04 21:46:18 +00:00
Adam Warner 2c6bc33e8d
Increase verbosity of error message when capabilities cannot be set - add note to readme about default DNSMASQ_USER. See #963 for details (#964) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-04 18:50:37 +00:00
Adam Warner 2a7ea09d00
Readme tweaks 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-02 15:54:09 +00:00
Adam Warner a5eda6844e
use kill -15 (TERM) instead of 9 to exit FTL a bit more gracefully and save queries to the database 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-02 14:30:31 +00:00
Adam Warner 44bdfc1438
bump s6 to latest 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-02 14:30:06 +00:00
Adam Warner 0eb1a60d78
Switch default DNSMASQ_USER to `pihole` from root, and fix permissions on `pihole-FTL.db` to belong to `pihole:pihole` 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-02 14:29:54 +00:00
Adam Warner 8ea5f9c8dc
Add CAP_SYS_NICE,CAP_CHOWN, and CAP_IPC_LOCK to the fix_capabilities() function 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-02 13:05:05 +00:00
Martin F. Schumann 2dde4a64c9
replace php env configuration lines if they are already present instead of adding them always (#952) (#957) 
Signed-off-by: Martin Schumann <mfs@mfs.name>
 2021-12-28 22:20:32 +00:00
Adam Warner 3f97e6e4fc
Only use branch ref for tag if we're not building via schedule event (namely, don;t also tag "master" when doing nightly) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-12-25 13:38:10 +00:00
Phill b0a5a0f163
Trailing slashes on volumes fail on newer versions of docker-compose (#949) 
* Trailing slashes on volumes fail on newer versions of docker-compose

See [Issue 947](https://github.com/pi-hole/docker-pi-hole/issues/947)
for the background.

This PR proposes removing trailing slashes from all documentation,
examples and scripts.

Signed-off-by: Phill Kelley <pmk.57t49@lgosys.com>
 2021-12-11 13:37:18 +00:00
Adam Warner 523762e47d
scream test: removing linux/ppc64le as there are build errors - unsure if anyone is _actually_ using this in any case. I guess we'll find out... 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-12-11 00:21:51 +00:00
Adam Warner 7848d06325
Switch base from `debian:buster-slim` to `ghcr.io/pi-hole/docker-pi-hole-base:buster-slim`, which is updated weekly and should speed up build times on this end 2021-12-11 00:20:04 +00:00
Adam Warner 54ca7e9ce4
Merge branch 'dev' of github.com:pi-hole/docker-pi-hole into dev 2021-12-10 20:51:51 +00:00
Adam Warner 9a9ee41a45
- Replace PIHOLE_VERSION with PIHOLE_DOCKER_TAG 
- reorder some stuff in the main Dockerfile
- Remove the CORE/WEB/FTL_VERSION args/env vars
- tweaks to GHA build script after some hints from @crazy-max
- always checkout dev versions of Pi-hole for nightly build, also make sure we're using dev branch of this repo
- keep pihole checkout enabled for dev and nightly tags

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-12-10 20:51:35 +00:00
Denis Khoshaba f70a4f4022
Update Dockerfile to use COPY instead of ADD as recommended on https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#add-or-copy (#946) 
Signed-off-by: TheDen <deniskhoshaba@gmail.com>

Co-authored-by: Adam Warner <me@adamwarner.co.uk>
 2021-12-09 19:30:13 +00:00
Adam Warner 7049b5df03
remove references to porrt 443 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-12-09 17:09:36 +00:00
AlexandreRatte 4aaf0998a3
Customize pihole-FTL.conf with FTLCONF_ prefixed environment variables. (#944) 
* Customize pihole-FTL.conf with FTLCONF_ prefixed environment variables.

Signed-off-by: Alexandre Ratte <alexandre.ratte@gmail.com>

* Reintroduced parsing of ServerIP* env vars and amended README for deprecated variables.

Signed-off-by: Alexandre Ratte <alexandre.ratte@gmail.com>
 2021-11-26 16:58:10 +00:00
Adam Warner 27bdf81665
Combine nightly and main workflows into one. Tested functionality on a fork so this can come straight into dev 
use dev images for the dev branch build.
Only disable pihole checkout on released tags - allow it in dev and nightly tags

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-11-17 23:42:49 +00:00
moritzbeck01 ff776c2ba4
[skip ci] Fixed link to reverse proxy (#939) 
The example seems to no longer be using jwilder/nginx-proxy but the very similar nginxproxy/nginx-proxy. Additionally the link to the example was broken.
 2021-10-31 14:41:55 +00:00
Fernando Fernández e874dc1f3e
Publish images to GHCR alongside DockerHub (#940) 
Signed-off-by: Fernando Fernández <ferferga@hotmail.com>
 2021-10-31 14:39:56 +00:00
Adam Warner c0d05f291d
Add PIHOLE_VERSION as PIHOLE_DOCKER_TAG in the php environment instead of injecting the version into the admin page's footer (#930) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-10-23 16:32:14 +01:00
Adam Warner a39726d183
remove reference to pihole/debian-base, replace with debian:{buster}-slim 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-10-09 18:48:17 +01:00
Adam Warner 5ed8b8ec7b
Merge pull request #928 from pi-hole/fix/docker-namespace 
* Use the namespace from secrets so others can build too.
* Add DOCKERHUB_NAMESPACE variable.
* Use hub namepace in all actions.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2021-10-03 22:21:47 +01:00
Dan Schaper aefeb2bc8d
Use hub namepace in all actions. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2021-10-03 14:15:30 -07:00
Dan Schaper 4782f15123
Add DOCKERHUB_NAMESPACE variable. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2021-10-03 13:41:31 -07:00
Dan Schaper 73a335533b
Use the namespace from secrets so others can build too. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2021-10-03 10:00:00 -07:00
Adam Warner d036e0d0c0
Merge branch 'dev' 2021-09-29 22:58:07 +01:00
Adam Warner 3696f6065f
Actually not needed as you can already choose to run it against whatever branch. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-09-16 20:58:35 +01:00
Adam Warner 9740d2b86a
Add option to run build against another branch to workflow_dispatch 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-09-16 20:54:42 +01:00
Adam Warner 1b6318c0d9
Merge branch 'dev' 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-09-15 18:34:33 +01:00
Adam Warner c371768800
And ppc64le - It might work, it might not. Someone will tell us if it doesn't. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-09-15 18:32:38 +01:00
Adam Warner bc545b6049
Add `linux/arm/v6` to `platforms:` 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-09-15 18:28:09 +01:00