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.

Sign up for GitHub

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

Jump to bottom

Use the new version file to check for updates #2306

Merged
merged 3 commits into from
Aug 26, 2022
Merged

Use the new version file to check for updates #2306

merged 3 commits into from
Aug 26, 2022

Conversation

rdwebdesign
Copy link
Member

  • What does this PR aim to accomplish?:

This PR uses the new file (created by pi-hole/pi-hole#4875) to check for updates.
It also adds a specific check for new docker tags.

  • How does this PR accomplish the above?:

Replacing the old files and using the new unified file to look for local versions/branches/new versions.
Added code to show "docker" updates.

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

none

Warning

Only merge after pi-hole/pi-hole#4875 is merged.

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)
  • I have read the above and my PR is ready for review. Check this box to confirm

@rdwebdesign rdwebdesign marked this pull request as draft August 22, 2022 21:18
@rdwebdesign rdwebdesign marked this pull request as ready for review August 22, 2022 22:27
@rdwebdesign rdwebdesign linked an issue Aug 22, 2022 that may be closed by this pull request
Use the new version file format for checks #2305
Closed
@PromoFaux PromoFaux mentioned this pull request Aug 23, 2022
Closed
1 task
@rdwebdesign rdwebdesign requested review from PromoFaux and a team August 23, 2022 23:15
@rdwebdesign rdwebdesign requested review from PromoFaux and a team August 24, 2022 23:16
@rdwebdesign
Check versions using the new file
2785775 
- change the arrays
- use a function to compare versions

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
@rdwebdesign
Move all "version check" code to update_checker.php
22a19e5 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
@rdwebdesign
New check warnings logic
d50c6bf 
Changes:
- Show warning message on docker, if a new image is available;
- Never show the warning for Nightly or Dev images;
- In docker, never show individual component update warnings;
- simplified footer (logic moved to upgrade_checker file).

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
@rdwebdesign rdwebdesign merged commit 308d081 into devel Aug 26, 2022
@rdwebdesign rdwebdesign deleted the tweak/version_check branch August 26, 2022 22:01
@yubiuser
Copy link
Member

Logspam ahead:

2022-08-28 20:36:16: (mod_fastcgi.c.421) FastCGI-stderr: PHP Notice:  Undefined index: GITHUB_DOCKER_VERSION in /var/www/html/admin/scripts/pi-hole/php/update_checker.php on line 68
2022-08-28 20:36:16: (mod_fastcgi.c.421) FastCGI-stderr: PHP Notice:  Undefined variable: docker_update in /var/www/html/admin/scripts/pi-hole/php/footer.php on line 93
2022-08-28 20:36:41: (mod_fastcgi.c.421) FastCGI-stderr: PHP Notice:  Undefined index: GITHUB_DOCKER_VERSION in /var/www/html/admin/scripts/pi-hole/php/update_checker.php on line 68
2022-08-28 20:36:41: (mod_fastcgi.c.421) FastCGI-stderr: PHP Notice:  Undefined variable: docker_update in /var/www/html/admin/scripts/pi-hole/php/footer.php on line 93
2022-08-28 20:39:04: (mod_fastcgi.c.421) FastCGI-stderr: PHP Notice:  Undefined index: GITHUB_DOCKER_VERSION in /var/www/html/admin/scripts/pi-hole/php/update_checker.php on line 68
2022-08-28 20:39:04: (mod_fastcgi.c.421) FastCGI-stderr: PHP Notice:  Undefined variable: docker_update in /var/www/html/admin/scripts/pi-hole/php/footer.php on line 93
2022-08-28 20:39:40: (mod_fastcgi.c.421) FastCGI-stderr: PHP Notice:  Undefined index: GITHUB_DOCKER_VERSION in /var/www/html/admin/scripts/pi-hole/php/update_checker.php on line 68
2022-08-28 20:39:40: (mod_fastcgi.c.421) FastCGI-stderr: PHP Notice:  Undefined variable: docker_update in /var/www/html/admin/scripts/pi-hole/php/footer.php on line 93
2022-08-28 20:41:09: (mod_fastcgi.c.421) FastCGI-stderr: PHP Notice:  Undefined index: GITHUB_DOCKER_VERSION in /var/www/html/admin/scripts/pi-hole/php/update_checker.php on line 68
2022-08-28 20:41:09: (mod_fastcgi.c.421) FastCGI-stderr: PHP Notice:  Undefined variable: docker_update in /var/www/html/admin/scripts/pi-hole/php/footer.php on line 93

@rdwebdesign rdwebdesign mentioned this pull request Aug 28, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PromoFaux PromoFaux PromoFaux approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Use the new version file format for checks
3 participants
@rdwebdesign @yubiuser @PromoFaux