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

Skip the required ports check if installed in docker container #4536

Merged
merged 1 commit into from Jan 8, 2022

Conversation

PromoFaux
Copy link
Member

@PromoFaux PromoFaux commented Jan 8, 2022

By submitting this pull request, I confirm the following:

  • I have read and understood the contributors guide, as well as this entire template.
  • I have made only one major change in my proposed changes.
  • I have commented my proposed changes within the code.
  • I have tested my proposed changes, and have included unit tests where possible.
  • I am willing to help maintain this change if there are issues with it later.
  • I give this submission freely and claim no ownership.
  • It is compatible with the EUPL 1.2 license
  • I have squashed any insignificant commits. (git rebase)

What does this PR aim to accomplish?:
The required ports check fails in docker due to the process being underprivileged by default. Works with priv'd container, or the minimal caps, but also is an unnessacery check as the container should not start with port clashes anyway.

How does this PR accomplish the above?:
Checks for the PIHOLE_DOCKER_TAG variable

What documentation changes (if any) are needed to support this PR?:
None

…v'ed containers do not have access to the information required to resolve the service name listening - and the container should not start if there was a port conflict anyway

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
@PromoFaux PromoFaux requested a review from a team January 8, 2022 12:43
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.

Seems reasonable to skip in docker

@yubiuser yubiuser merged commit 3097c8f into development Jan 8, 2022
@yubiuser yubiuser deleted the tweak/skip-port-check-docker branch January 8, 2022 12:57
@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/pi-hole-ftl-v5-14-web-v5-11-and-core-v5-9-released/53529/1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants