[v5] Fix architecture detection for linux/386 images #1599
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
PromoFaux
changed the title
PromoFaux
changed the title
PromoFaux
force-pushed
the
tweak/386-workaround
branch
from
cc6967a
to
eda9fdc
Compare
…we're not really on an i386 image to prevent wrong s6 overlay version being downloaded on a 32 bit image Signed-off-by: Adam Warner <[email protected]>
yubiuser
approved these changes
Jun 15, 2024
truecharts-admin
added a commit
to truecharts/charts
that referenced
this pull request
Jun 18, 2024
…9b by renovate (#23441) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [pihole/pihole](https://togithub.com/pi-hole/docker-pi-hole) | minor | `2024.05.0` -> `2024.06.0` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>pi-hole/docker-pi-hole (pihole/pihole)</summary> ### [`v2024.06.0`](https://togithub.com/pi-hole/docker-pi-hole/releases/tag/2024.06.0): (The "I can't believe it wasn't working on 32-bit machines for the past year" edition) [Compare Source](https://togithub.com/pi-hole/docker-pi-hole/compare/2024.05.0...2024.06.0) Fixes compatibility with 32-bit (i386/x86/whatever you want to call it) architecture by ensuring the correct s6-overlay binaries are downloaded. No other changes for other architectures. <!-- Release notes generated using configuration in .github/release.yml at master --> #### What's Changed - Remove obsolete "version" value from example docker-compose.yml by [@​lemondjeff](https://togithub.com/lemondjeff) in [pi-hole/docker-pi-hole#1563 - \[v5] Fix architecture detection for linux/386 images by [@​PromoFaux](https://togithub.com/PromoFaux) in [pi-hole/docker-pi-hole#1599 **Full Changelog**: pi-hole/docker-pi-hole@2024.05.0...2024.06.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40MDkuMSIsInVwZGF0ZWRJblZlciI6IjM3LjQwOS4xIiwidGFyZ2V0QnJhbmNoIjoibWFzdGVyIiwibGFiZWxzIjpbImF1dG9tZXJnZSIsInVwZGF0ZS9kb2NrZXIvZ2VuZXJhbC9ub24tbWFqb3IiXX0=--> --------- Signed-off-by: alfi0812 <[email protected]> Co-authored-by: alfi0812 <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR aim to accomplish?:
Fixes #1524
archreturnsx86_64when using--platform=linux/386with the docker build command, whereasdpkg --print-architecturereturnsi386Interestingly, building the image on an actual 32 bit machine does not show the same behaviour, so I guess this is an issue with
docker build. No matter, this will work for now and will allow people to use:lateston 32-bit hosts if they wish. (v6 has no such issue)By submitting this pull request, I confirm the following:
git rebase)