Fix drone publish for arm

Signed-off-by: Brad Davidson <[email protected]>

Author: brandond

.drone.yml

@@ -206,7 +206,8 @@ steps:
     dockerfile: package/Dockerfile
   environment:
     ARCH: "${DRONE_STAGE_ARCH}"
-    DOCKER_BUILDKIT: "1"
+    # Don't enable buildkit on arm, it will barf on the platform variant mismatch
+    #DOCKER_BUILDKIT: "1"
   when:
     event:
     - tag

scripts/build

@@ -6,6 +6,12 @@ source $(dirname $0)/version
 cd $(dirname $0)/..
 
 mkdir -p bin
+
+if [ ${ARCH} = armv7l ] || [ ${ARCH} = arm ]; then
+    export GOARCH="arm"
+    export GOARM="7"
+fi
+
 if [ "$(uname)" = "Linux" ]; then
     OTHER_LINKFLAGS="-extldflags -static -s"
 fi

scripts/version

@@ -13,17 +13,8 @@ else
     VERSION="${COMMIT}${DIRTY}"
 fi
 
-if [ -n "$ARCH" ]; then
-    GOARCH=${ARCH}
-fi
-if [ -z "$GOARCH" ]; then
-    GOARCH=$(go env GOHOSTARCH)
-fi
-if [ "$GOARCH" = "arm" ]; then
-    GOARM=7
-fi
-
-ARCH="${GOARCH}"
+GO=${GO-go}
+ARCH=${ARCH:-$("${GO}" env GOARCH)}
 SUFFIX="-${ARCH}"
 
 TAG=${TAG:-${VERSION}${SUFFIX}}