Pi-Hole/docker-pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2025-12-26 21:26:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,194 Commits 10 Branches 141 Tags
f43429f139c0715c484557e3432cb9c4fce4da20
Commit Graph

179 Commits

Author SHA1 Message Date
DL6ER
63f36bfdd5 Add CAP_SYS_TIME in the container if available 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-06-08 11:04:52 +02:00
Adam Warner
4c8066a9e0 Change default value of PIHOLE_DOCKER_TAG in dockerfile 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-05-27 22:42:15 +01:00
Adam Warner
a49600e63d Install grep to avoid issues in pihole -w/b with the default busybox grep 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-05-08 22:27:40 +01:00
shamoon
1b6469ba74 Fix: correct dns upstreams variable name 
Signed-off-by: shamoon <4887959+shamoon@users.noreply.github.com>
 2024-03-28 11:40:01 -07:00
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
Christian König
24090b227e Add dockerfile frontend synatax line 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2024-01-10 13:49:05 +01:00
Christian König
dbf3ddfa24 Update alpine to 3.19 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-12-16 23:23:21 +01:00
Adam Warner
7f89be5b1d install the logrotate file into /etc/pihole at startup in case of volume mounting 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-11-06 21:43:42 +00:00
Christian König
8a6bda4a89 Create dir for logrotate statefile 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-11-03 22:05:29 +01: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
Christian König
06819bdd51 Install logrotate 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-10-31 21:16:05 +01:00
Christian König
c9e23f5a92 /etc/pihole is already created within the Dockerfile 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-10-30 23:34:48 +01:00
Christian König
752c49e5de Install logrotate from repo 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-10-30 23:31:40 +01:00
Adam Warner
b688b46f13 linux/arm64/v8 should be linux/arm64. 
This is a regression, added a note to make sure it does not happen again

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-10-30 21:22:18 +00:00
Adam Warner
335ec7e40d explicitly test for pwhash containing a value beginning $BALOON-SHA256 2023-10-28 19:47:59 +01:00
Adam Warner
5c7ff5c539 TARGETPLATFORM needs to be set 
Co-authored-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-10-22 22:14:31 +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
0489e57d10 Add special handling for FTL Config names that have underscores in them 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-10-16 17:11:11 +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
92ab9ad4ac Merge pull request #1423 from pi-hole/v6/additional_packages 
Allow end user to add additional packages to the image
 2023-09-25 22:36:36 +01:00
Adam Warner
bf12b02636 Update src/start.sh 
Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
 2023-09-25 20:00:22 +01:00
Adam Warner
672797b229 Remove the "INSTALL_DEV_TOOLS" environment variable in favour of "ADDITIONAL_PACKAGES", to allow user to add any package they wish to the container. Will be mentioned in README with a HERE BE DRAGONS warning. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-09-21 00:01:37 +01:00
Adam Warner
0704f06cd8 Update src/start.sh 
Co-authored-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
 2023-09-10 20:42:10 +01:00
Adam Warner
76e09bf15a Give users an option to silence the FTL log output by passing in the environment variable TAIL_FTL_LOG with a value of 0. Defaults to enabled (1) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-09-03 13:02:50 +01:00
Adam Warner
374f6f2537 Add in a test to kill start.sh and then ensure that pihole-FTL is gracefully exited. 
We add in some sleeps to ensure that the log file is being written to before we check it
Log entry tests are based on many different passes of running this locally with all sorts of timeouts and sleeps, this seems to be the most consistent

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-08-09 23:31:39 +01:00
Adam Warner
696895fa59 Fix some broken logic in the gravity skip code (I should have read it better) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-08-09 22:15:41 +01:00
Adam Warner
94795db7e9 correct tini path 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-08-09 21:38:49 +01:00
Adam Warner
3cebec9344 Add tini anyway (see `tini + bash 4.x at https://ahmet.im/blog/minimal-init-process-for-containers/) 
bash isn't going anywhere for the time being

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-08-09 21:20:12 +01:00
Adam Warner
b674a8bde7 Who needs an init system anyway? Add a trap to ensure that pihole-FTL shuts down cleanly on container exit. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-08-09 21:20:11 +01:00
Adam Warner
fa2eb0d2f5 Merge pull request #1402 from edgd1er/skigravityonboot 
if skipgravityonboot set, check db version.
 2023-08-09 19:47:04 +01:00
Adam Warner
0748c7fc62 Update src/start.sh 
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
 2023-08-09 19:46:48 +01:00
Adam Warner
f24dd34e37 Update src/start.sh 
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
 2023-08-02 23:00:00 +01:00
Christian König
81e7671441 Revert alias and make branch configurable 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-08-02 22:20:20 +02:00
Christian König
d89d826951 Add padd alias 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-08-01 21:29:30 +02:00
Christian König
76b6d5bdb4 Add PADD to the image 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-07-31 23:38:39 +02:00
Adam Warner
e88985ba40 This is not needed! 
Co-authored-by: Christian König <ckoenig@posteo.de>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-28 21:58:48 +01:00
Dan Schaper
9a058c5511 Alphebetize dependencies for organization. 2023-07-28 10:10:10 -07:00
Gontier Julien
dfdf5fa930 Tell alpine specifically to use procps-ng 
Signed-off-by: Gontier Julien <gontierjulien68@gmail.com>
 2023-07-28 17:17:51 +02:00
edgd1er
7cf55cb722 if skipgravityonboot set, check db version 
Signed-off-by: edgd1er <edgd1er@hotmail.com>
 2023-07-27 03:24:55 +02:00
edgd1er
a2770a3f18 uid/gid: add info when already as expected 
Signed-off-by: edgd1er <edgd1er@hotmail.com>
 2023-07-26 22:50:10 +02:00
edgd1er
2a8fa77adc extracted functions need to be rewritten to remove the return 
Signed-off-by: edgd1er <edgd1er@hotmail.com>
 2023-07-26 22:11:51 +02:00
Adam Warner
62dd8d503c Allow the for changing of the UID/GID of the user/group pihole 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-26 08:25:08 +01:00
Adam Warner
93826e2d1d Add tzdata package so that users can define their own timezone at runtime 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-24 00:12:46 +01:00
edgd1er
45bbb490d0 Update src/Dockerfile 
Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: edgd1er <edgd1er@hotmail.com>
 2023-07-24 00:43:21 +02:00
edgd1er
926b3ae8c6 fix arm64 arch. use copy --chmod 2023-07-24 00:39:02 +02:00
Adam Warner
e352c6b2ac re-add the PIHOLE_DOCKER_TAG build arg that went missing along the way 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-23 18:45:06 +01:00
Adam Warner
3b5cf34036 Merge pull request #1384 from pi-hole/v6/branch-args 
Allow branch names to be passed in as build args
 2023-07-21 19:05:42 +01:00