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
f31b4694c8
Delimter for array type FTLCONF_ values is ;
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-10-29 20:55:41 +00:00
230e14e633
Merge pull request #1464 from pi-hole/v6/tweak_delimiter
...
Clarify delimter for array type FTLCONF_ values
2023-10-29 18:10:39 +00:00
9928cfa630
Clarify delimter for array type FTLCONF_ values
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-10-29 17:48:24 +00:00
76e45a5211
Merge pull request #1460 from pi-hole/v6/FTLCONF_
...
Updates to reflect FTL's native capability of reading the FTLCONF_ env vars
2023-10-29 11:17:22 +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
ae90e9c854
Trim some fat
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-10-22 22:14:29 +01:00
bb2a7b1153
Update README.md
...
Co-authored-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
2023-10-22 17:42:29 +01:00
b8a717f925
Re-do tests to account for FTLCONF_ changes. Add new tests for web password
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-10-22 17:42:29 +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
77ee293ac0
Merge pull request #1456 from pi-hole/v6/special-env
...
Add special handling for FTL Config names that have underscores in them
2023-10-16 20:35:33 +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
27b4c8a1bf
Merge pull request #1450 from pi-hole/adminlte-to-web
...
Update references to web repo
2023-10-08 19:51:37 +01:00
6fa1759814
AdminLTE -> web
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-10-08 14:06:35 +01:00
938f3a2ed0
Merge pull request #1444 from pi-hole/readme/altbranches
...
Add instructions for rebuilding the image with a custom component branch
2023-10-08 13:50:10 +01:00
4c2d0ab34f
Add valid args
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-09-27 18:14:45 +01:00
7011839026
Add some information about building a custom image with an alternative component branch
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-09-27 18:08:51 +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
b893784c09
Update README.md
...
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
2023-09-25 17:27:16 +01:00
93462c090f
Merge pull request #1385 from pi-hole/v6/quiet-output
...
Make the FTL log tail optional. Pass in `TAIL_FTL_LOG: 0` to silence it
2023-09-21 00:04:15 +01:00
3ca2aea41c
Add documentation
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-09-21 00:03:25 +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
bb3eee6665
Merge pull request #1429 from pi-hole/v6/readme
...
Update Readme
2023-09-20 23:59:46 +01:00
2afc9eef0b
Merge pull request #1435 from pi-hole/dependabot/github_actions/development-v6/docker/metadata-action-5
...
Bump docker/metadata-action from 4 to 5
2023-09-16 15:32:53 +02:00
57957574d2
Bump docker/metadata-action from 4 to 5
...
Bumps [docker/metadata-action](https://github.com/docker/metadata-action ) from 4 to 5.
- [Release notes](https://github.com/docker/metadata-action/releases )
- [Upgrade guide](https://github.com/docker/metadata-action/blob/master/UPGRADE.md )
- [Commits](https://github.com/docker/metadata-action/compare/v4...v5 )
---
updated-dependencies:
- dependency-name: docker/metadata-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-09-16 13:28:14 +00:00
2e957f1e6f
Merge pull request #1434 from pi-hole/dependabot/github_actions/development-v6/docker/build-push-action-5
...
Bump docker/build-push-action from 4 to 5
2023-09-16 15:27:34 +02:00
71b8d50c55
Bump docker/build-push-action from 4 to 5
...
Bumps [docker/build-push-action](https://github.com/docker/build-push-action ) from 4 to 5.
- [Release notes](https://github.com/docker/build-push-action/releases )
- [Commits](https://github.com/docker/build-push-action/compare/v4...v5 )
---
updated-dependencies:
- dependency-name: docker/build-push-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-09-16 13:21:39 +00:00
c7bbc39909
Merge pull request #1436 from pi-hole/dependabot/github_actions/development-v6/docker/setup-buildx-action-3
...
Bump docker/setup-buildx-action from 2 to 3
2023-09-16 15:21:02 +02:00
e4a46df21a
Bump docker/setup-buildx-action from 2 to 3
...
Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action ) from 2 to 3.
- [Release notes](https://github.com/docker/setup-buildx-action/releases )
- [Commits](https://github.com/docker/setup-buildx-action/compare/v2...v3 )
---
updated-dependencies:
- dependency-name: docker/setup-buildx-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-09-16 13:16:45 +00:00
3fc1d87ef7
Merge pull request #1437 from pi-hole/dependabot/github_actions/development-v6/docker/setup-qemu-action-3
...
Bump docker/setup-qemu-action from 2 to 3
2023-09-16 15:16:04 +02:00
aa44c5a44b
Bump docker/setup-qemu-action from 2 to 3
...
Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action ) from 2 to 3.
- [Release notes](https://github.com/docker/setup-qemu-action/releases )
- [Commits](https://github.com/docker/setup-qemu-action/compare/v2...v3 )
---
updated-dependencies:
- dependency-name: docker/setup-qemu-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-09-16 10:35:24 +00: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
48970d8bb7
Quick first pass of Readme update. Probably still needs more work. Can happen as we go
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-09-10 17:13:33 +01:00
429739d060
Merge pull request #1427 from pi-hole/dependabot/github_actions/development-v6/actions/checkout-4
...
Bump actions/checkout from 3 to 4
2023-09-09 17:45:46 +02:00
9ee27ed2f8
Bump actions/checkout from 3 to 4
...
Bumps [actions/checkout](https://github.com/actions/checkout ) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases )
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md )
- [Commits](https://github.com/actions/checkout/compare/v3...v4 )
---
updated-dependencies:
- dependency-name: actions/checkout
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-09-09 10:09:31 +00: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
9c46f8b9ba
Merge pull request #1406 from pi-hole/v6/even-tinier
...
Ensure pihole-FTL process is shut down cleanly on container exit / add tini
2023-09-03 12:43:05 +01:00
7e4de03a1f
add EUPL license
...
I copied this file from https://github.com/pi-hole/pi-hole
2023-09-03 12:37:22 +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
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
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
b56b8d03c4
black formatted some tests
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-08-09 21:18:10 +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
Adam Warner
Christian König
dependabot[bot]
Adam Monsen
Adam Warner