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

Display update information of individual components only if we are not running in a Docker container #3170

Merged
merged 1 commit into from
Nov 22, 2024

Conversation

yubiuser
Copy link
Member

@yubiuser yubiuser commented Nov 1, 2024

What does this PR aim to accomplish?:

Ports some v5 logic to v6.

// Version comparison
if ($docker_current) {
// It's a container: do not check for individual component updates
if ($docker_current == 'nightly' || $docker_current == 'dev') {
// Special container - no update messages
$docker_update = false;
} else {
$docker_update = checkUpdate($docker_current, $docker_latest);
}
} else {
// Components comparison
$core_update = checkUpdate($core_current, $core_latest);
$web_update = checkUpdate($web_current, $web_latest);
$FTL_update = checkUpdate($FTL_current, $FTL_latest);
// Not a docker container
$docker_update = false;
}
}

Mitigates https://discourse.pi-hole.net/t/v6-docker-not-updating/73670


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 and I have tested my changes.
  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)
  6. I have checked that another pull request for this purpose does not exist.
  7. I have considered, and confirmed that this submission will be valuable to others.
  8. I accept that this submission may not be used, and the pull request closed at the will of the maintainer.
  9. I give this submission freely, and claim no ownership to its content.

  • I have read the above and my PR is ready for review. Check this box to confirm

@yubiuser yubiuser requested a review from a team November 1, 2024 20:57
…t running in a Docker container

Signed-off-by: yubiuser <[email protected]>
@yubiuser yubiuser requested review from a team and DL6ER November 3, 2024 18:19
@DL6ER DL6ER requested a review from Copilot November 22, 2024 17:36

Choose a reason for hiding this comment

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

Copilot reviewed 1 out of 1 changed files in this pull request and generated no suggestions.

@DL6ER DL6ER merged commit 47e977a into development Nov 22, 2024
11 checks passed
@DL6ER DL6ER deleted the no_update_docker branch November 22, 2024 17:38
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