docker/docker-pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2024-06-30 21:20:59 +02:00
Code Issues Releases Wiki Activity
1,662 Commits 10 Branches 115 Tags 4.8 MiB
b41d50b94f
Commit Graph

1662 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Warner
b41d50b94f
Remove volume mount from tests, this causes issues with gravity not being able to read an adlist file symlinked to /dev/null 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-08-09 22:57:35 +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
b56b8d03c4
black formatted some tests 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-08-09 21:18:10 +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
661bc42543
Merge pull request #1410 from pi-hole/padd/v6 
Add PADD to the image
 2023-08-02 23:02:59 +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
2c5f02df28
Merge pull request #1409 from pi-hole/v6/uninstall.sh 
No need for uninstall.sh in the container image
 2023-07-28 22:21:01 +01: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
Adam Warner
3c3563c289
Merge pull request #1408 from pi-hole/chore/alpine-alphebetize 
Alphebetize alpine dependencies for organization.
 2023-07-28 18:23:20 +01:00
Dan Schaper
9a058c5511
Alphebetize dependencies for organization. 2023-07-28 10:10:10 -07:00
Adam Warner
fbaf191304
Merge pull request #1407 from Gontier-Julien/fix-procps 
Tell alpine specifically to install/use procps-ng
 2023-07-28 17:17:32 +01: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
Adam Warner
bfd8b1b380
Merge pull request #1404 from edgd1er/fix_uid_gid 
[dev-v6]:extracted uid/gid functions need to be rewritten to remove the return
 2023-07-26 22:03:25 +01: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
e0678bd803
Merge pull request #1403 from pi-hole/v6/change-pihole-userid 
Allow the for changing of the UID/GID of the user/group pihole
 2023-07-26 17:37:59 +01:00
Adam Warner
f09b0d68bb
Add tests for UID/GID switching 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-26 08:31:29 +01: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
6065425ba4
Merge pull request #1396 from pi-hole/v6/tests 
Add tests back to the development-v6 container
 2023-07-26 08:23:13 +01:00
Adam Warner
fee259597c
./build-and-test.sh enter was not working because bash not installed, change command to sh instead of bash 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-24 18:47:47 +01:00
Adam Warner
4c8f4613dd
test names should match the regular expression ^[a-z_][a-z0-9_]*$. Apparently 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-24 18:37:46 +01:00
Adam Warner
1202dafcbd
Change test dockerfile base to docker:24.0.4-cli-alpine3.18 rather than copying in, buildx would not work the other way. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-24 18:37:37 +01:00
Adam Warner
3208c4042d
Strip out no longer relevant tests/test fixtures (persist_docker, for example has not been used in a long time) , begin building test library from ground up. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-24 18:11:33 +01:00
Adam Warner
6b5332be47
- Change test dockerfile base to alpine, too (Alpine all the things!) 
- Tweak build-and-test.sh to allow tests to run against more platforms using buildx
- Split GHA out into two seperate files. One for tests on pull requests, another for build and merge on push to `development-v6` (add other branches in later)

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-24 18:11:33 +01:00
Adam Warner
a317129a41
Merge pull request #1394 from pi-hole/v6/tzdata 
Add tzdata package so that users can define their own timezone at runtime
 2023-07-24 12:39:46 +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
Adam Warner
a92679868d
Merge pull request #1393 from edgd1er/Dockerfile_changes 
fix arm64 arch.  use copy --chmod. reduce number of layers.
 2023-07-24 00:10:39 +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
4471863464
Merge pull request #1395 from pi-hole/v6/docker_tag 
re-add the PIHOLE_DOCKER_TAG build arg that went missing along the way
 2023-07-23 23:30:30 +01: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
Adam Warner
46adac81d3
Merge pull request #1392 from pi-hole/v6/add-ncurses 
Add `ncurses` back in for the time being to fix pihole -v output.
 2023-07-20 19:23:11 +01:00
Adam Warner
8cc91c5ae5
Add ncurses back in for the time being to fix pihole -v output. It was removed in #1366. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-20 19:20:32 +01:00
Adam Warner
bf414721e0
Allow branch names to be passed through as ARGs default development-v6 (for now) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-20 18:26:13 +01:00
Adam Warner
41511c5881
Merge pull request #1391 from Gontier-Julien/reduce-git-size 
Reduce git clone size, by cloning only what is needed
 2023-07-20 18:23:55 +01:00
Gontier Julien
e4b5da2f6d Reduce git clone size by only cloning what is needed 
Signed-off-by: Gontier Julien <gontierjulien68@gmail.com>
 2023-07-19 20:44:52 +02:00
Adam Warner
348e27b45f
Merge pull request #1368 from pi-hole/reimplement-skip-gravity 
Re-implement SKIPGRAVITYONBOOT
 2023-07-17 17:37:23 +01:00
Adam Warner
d5b639daee
Merge pull request #1366 from pi-hole/tweak/remove_deps 
Remove some unnessacery dependencies
 2023-07-17 17:36:52 +01:00
Adam Warner
a3a199cb47
Merge pull request #1382 from Gontier-Julien/ADD-to-COPY 
Change so ADD to COPY following docker best practices
 2023-07-16 19:07:02 +01:00
Adam Warner
91f07711d0
Merge pull request #1381 from Gontier-Julien/development-v6 
Remove one layer by having both git clone together
 2023-07-16 19:05:47 +01:00
Snow
030e375386
add a space between && and \ for readability 
Make it consistence with other multi-line commands.

Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: Snow <52894530+Gontier-Julien@users.noreply.github.com>
 2023-07-16 12:14:56 +02:00