aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormacmpi <spam@ipik.org>2019-10-27 17:55:24 +0100
committerRichard Mortier <mort@cantab.net>2019-11-18 21:29:33 +0000
commit7645fda4f2f0aba95c521cbb8da689c5bf34d1c9 (patch)
treede5ad1c0026d37dde60c78d26339830eef18035d
parent51df022aec89a842111e03a4074e10de5d865381 (diff)
downloaddocker-abuild-7645fda4f2f0aba95c521cbb8da689c5bf34d1c9.tar.bz2
docker-abuild-7645fda4f2f0aba95c521cbb8da689c5bf34d1c9.tar.xz
Workaround for ARCH detection
Restored alpine docker genuinely supported architectures (as other ones are definitely not). Just give a clue to set wanted DABUILD_ARCH variable at invocation, when uname does not provide adequate info on some platforms like Pi.
-rwxr-xr-xdabuild.in5
1 files changed, 3 insertions, 2 deletions
diff --git a/dabuild.in b/dabuild.in
index b447562..fb44412 100755
--- a/dabuild.in
+++ b/dabuild.in
@@ -26,9 +26,10 @@ fi
## allow setting of arch by env variable
[ ! "$DABUILD_ARCH" ] && DABUILD_ARCH=$(uname -m)
case "$DABUILD_ARCH" in
- x86|x86_64|aarch64|armv6|armv7|armv7l|armv8 ) ;;
+ x86|x86_64|aarch64|armhf|armv7 ) ;;
* ) die "Unsupported arch \"$DABUILD_ARCH\" detected." \
- "Expected one of: x86|x86_64|aarch64|armv6|armv7|armv7l|armv8";;
+ "Expected one of: x86|x86_64|aarch64|armhf|armv7" \
+ "You may force it setting DABUILD_ARCH=\"xxx\" in invocation";;
esac
## use branch to figure out most appropriate alpine version