8717bab5c3
Ability to pass in an additional command to run when the container starts. Undocumented variable. Potential for danger? Of course. But maybe it is useful. Commented use case - up for discussion
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-10-29 21:03:32 +00:00
335ec7e40d
explicitly test for pwhash containing a value beginning $BALOON-SHA256
2023-10-28 19:47:59 +01:00
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
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
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
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
6fa1759814
AdminLTE -> web
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-10-08 14:06:35 +01:00
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
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
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
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
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
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
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
94795db7e9
correct tini path
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-08-09 21:38:49 +01:00
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
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
fa2eb0d2f5
Merge pull request #1402 from edgd1er/skigravityonboot
...
if skipgravityonboot set, check db version.
2023-08-09 19:47:04 +01:00
0748c7fc62
Update src/start.sh
...
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
2023-08-09 19:46:48 +01:00
f24dd34e37
Update src/start.sh
...
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
2023-08-02 23:00:00 +01:00
81e7671441
Revert alias and make branch configurable
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-08-02 22:20:20 +02:00
d89d826951
Add padd alias
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-08-01 21:29:30 +02:00
76b6d5bdb4
Add PADD to the image
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-07-31 23:38:39 +02:00
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
9a058c5511
Alphebetize dependencies for organization.
2023-07-28 10:10:10 -07:00
dfdf5fa930
Tell alpine specifically to use procps-ng
...
Signed-off-by: Gontier Julien <gontierjulien68@gmail.com>
2023-07-28 17:17:51 +02:00
7cf55cb722
if skipgravityonboot set, check db version
...
Signed-off-by: edgd1er <edgd1er@hotmail.com>
2023-07-27 03:24:55 +02:00
a2770a3f18
uid/gid: add info when already as expected
...
Signed-off-by: edgd1er <edgd1er@hotmail.com>
2023-07-26 22:50:10 +02:00
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
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
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
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
926b3ae8c6
fix arm64 arch. use copy --chmod
2023-07-24 00:39:02 +02:00
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
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
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
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
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
348e27b45f
Merge pull request #1368 from pi-hole/reimplement-skip-gravity
...
Re-implement SKIPGRAVITYONBOOT
2023-07-17 17:37:23 +01:00
d5b639daee
Merge pull request #1366 from pi-hole/tweak/remove_deps
...
Remove some unnessacery dependencies
2023-07-17 17:36:52 +01:00
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
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
1a1e4cecb7
Change so ADD to COPY following best practices
...
Signed-off-by: Gontier Julien <gontierjulien68@gmail.com>
2023-07-15 23:29:58 +02:00
f15640505c
Remove one layer by having both git clone together
...
Signed-off-by: Gontier Julien <gontierjulien68@gmail.com>
2023-07-15 23:13:11 +02:00
11b6b8bd34
Remove some dependencies, move nano & less to the start script and only intall if env var `INSTALL_DEV_TOOLS` > 0
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-07-11 19:15:52 +01:00
5d33fdadd3
reimplement allowing user to skip gravity on boot with the environment variable SKIPGRAVITYONBOOT (as with v5)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-07-11 19:15:37 +01:00
5435c9d6c1
Start FTL after running gravity completely. Else we end up in a situation where the database getss stuck in readonly
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-07-09 17:09:32 +01:00
c89d5d1286
Minor formatting tweaks
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-07-09 17:02:38 +01:00
d415bffcb7
Create our own cron file rather than copying the one from the core repo (which contains non-standard cron syntax)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-07-03 22:54:49 +01:00
cc3789df21
Attempt to reduce code reuse in action
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-07-03 22:01:44 +01:00
Adam Warner
Adam Warner
Christian König
Dan Schaper
Gontier Julien
edgd1er
Snow