Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow other FTL process inside docker #2037

Merged
merged 1 commit into from
Aug 26, 2024
Merged

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Aug 22, 2024

What does this implement/fix?

Do not refuse to (re)start if there is another pihole-FTL process already running inside a docker container on the same host.

Currently, (re)starting on the host is prevented when FTL detects during startup that another process is running on the machine (the one inside the container) even when they can obviously run alongside perfectly fine. This is caused by the host being able to see all processes, not only the one in its own container, i.e., in its own cgroup*. This actually hinders development/testing natively on the host.

This commit fixes this by not considering pihole-FTL processes running in downstream (!) docker containers as duplicate instances.

How can this be reproduced? After installing Pi-hole natively on a device, also start a docker container running pihole-FTL. Then, try to restart pihole-FTL on the host and observe that this is prevented as the task running inside the container is considered a duplicate process. This is quite obviously a false-positive detection.

*) Docker utilizes cgroups to control and limit the resources available to containers.

This is a regression of #2025


Related issue or feature (if applicable): N/A

Pull request in docs with documentation (if applicable): N/A


By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)

Checklist:

  • The code change is tested and works locally.
  • I based my code and PRs against the repositories developmental branch.
  • I signed off all commits. Pi-hole enforces the DCO for all contributions
  • I signed all my commits. Pi-hole requires signatures to verify authorship
  • I have read the above and my PR is ready for review.

Do not refuse to (re)start if there is another pihole-FTL process already running *inside* a docker container on the same host. Currently, (re)starting on the host is prevented when FTL detects during startup that another process is running on the machine (the one inside the container) even when they can obviously run alongside perfectly fine. This is caused by the host being able to see *all* processes, not only the one in its own cgroup.
This actually hinders development/testing natively on the host. This commit fixes this by not considering pihole-FTL processes running in downstream (!) docker containers as duplicate instances.

Signed-off-by: DL6ER <[email protected]>
@DL6ER DL6ER requested a review from a team August 22, 2024 15:13
Copy link
Member

@yubiuser yubiuser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested. Works nicely as described.

@DL6ER DL6ER merged commit 2341704 into development-v6 Aug 26, 2024
16 checks passed
@DL6ER DL6ER deleted the fix/another_in_docker branch August 26, 2024 15:04
@PromoFaux PromoFaux mentioned this pull request Feb 18, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants