Skip to content

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

Merged
DL6ER merged 1 commit into
developmentfrom
no_update_docker
Nov 22, 2024
Merged

Display update information of individual components only if we are not running in a Docker container#3170
DL6ER merged 1 commit into
developmentfrom
no_update_docker

Conversation

@yubiuser

@yubiuser yubiuser commented Nov 1, 2024 •
edited
Loading

Copy link
Copy Markdown
Member

What does this PR aim to accomplish?:

Ports some v5 logic to v6.

web/scripts/pi-hole/php/update_checker.php

Lines 82 to 100 in 5c8945c

// 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
@yubiuser
Display update information of individual components only if we are no…
664e2da 
…t running in a Docker container

Signed-off-by: yubiuser <github@yubiuser.dev>
DL6ER
DL6ER reviewed Nov 3, 2024
View reviewed changes
Comment thread scripts/js/footer.js
@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
Copilot AI reviewed Nov 22, 2024
View reviewed changes

Copilot AI left a comment

Copy link
Copy Markdown

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
@DL6ER DL6ER deleted the no_update_docker branch November 22, 2024 17:38
@PromoFaux PromoFaux mentioned this pull request Feb 18, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot Copilot left review comments

@DL6ER DL6ER DL6ER approved these changes

Assignees

No one assigned

Labels

Pi-hole v6.0

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@yubiuser @DL6ER