mirror of
https://github.com/pi-hole/docker-pi-hole.git
synced 2025-12-20 02:18:51 +00:00
fall back to using dpkg when arch is detected as x86_64 to make sure 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 <me@adamwarner.co.uk>
This commit is contained in:
@@ -17,8 +17,14 @@ detect_arch() {
|
||||
S6_ARCH="armhf";;
|
||||
armv7l)
|
||||
S6_ARCH="armhf";;
|
||||
i386)
|
||||
S6_ARCH="i686";;
|
||||
x86_64)
|
||||
# arch returns x86_64 on linux/i386, causing the wrong s6-overlay to be downloaded
|
||||
# fallback to dpkg to check the architecture and download the i686 s6-overlay if necessary
|
||||
# see https://github.com/pi-hole/docker-pi-hole/issues/1524 for more information
|
||||
ARCH_CHECK=$(dpkg --print-architecture)
|
||||
if [ "$ARCH_CHECK" == "i386" ]; then
|
||||
S6_ARCH="i686"
|
||||
fi
|
||||
esac
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user