new drone bits

ci/scripts/build.sh

@@ -2,125 +2,48 @@
 set -euo pipefail
 IFS=$'\n\t'
 
-export PLATFORM=$1
-export ZT_ISA=$2
-export VERSION=$3
-export EVENT=$4
+ZT_NAME="$1" ; shift
+DISTRO="$1" ; shift
+ZT_ISA="$1" ; shift
+VERSION="$1" ; shift
+BUILD_EVENT="$1" ; shift
 
-case $PLATFORM in
-    sid)
-        export PKGFMT=none
-        ;;
-    el*|fc*|amzn*)
-        export PKGFMT=rpm
-        ;;
-    *)
-        export PKGFMT=deb
-esac
+source "$(dirname $0)/lib.sh"
 
-#
-# Allow user to drop in custom Dockerfile for PLATFORM
-#
-
-if [ -f "ci/Dockerfile.${PLATFORM}" ]; then
-    export DOCKERFILE="ci/Dockerfile.${PLATFORM}"
+if [ -f "ci/Dockerfile-build.${ZT_NAME}" ]; then
+    DOCKERFILE="ci/Dockerfile-build.${ZT_NAME}"
 else
-    export DOCKERFILE="ci/Dockerfile.${PKGFMT}"
+    DOCKERFILE="ci/Dockerfile-build.${PKGFMT}"
 fi
 
-#
-# Rust sometimes gets confused about where it's running.
-# Normally, the build images will have Rust pre-baked.
-# Pass RUST_TRIPLET for convenience when using a custom Dockerfile
-#
-
-case $ZT_ISA in
-    386)
-        export DOCKER_ARCH=386
-        export RUST_TRIPLET=i686-unknown-linux-gnu
-        ;;
-    amd64)
-        export DOCKER_ARCH=amd64
-        export RUST_TRIPLET=x86_64-unknown-linux-gnu
-        ;;
-    armv7)
-        export DOCKER_ARCH=arm/v7
-        export RUST_TRIPLET=armv7-unknown-linux-gnueabihf
-        ;;
-    arm64)
-        export DOCKER_ARCH=arm64/v8
-        export RUST_TRIPLET=aarch64-unknown-linux-gnu
-        ;;
-    riscv64)
-        export DOCKER_ARCH=riscv64
-        export RUST_TRIPLET=riscv64gc-unknown-linux-gnu
-        ;;
-    ppc64le)
-        export DOCKER_ARCH=ppc64le
-        export RUST_TRIPLET=powerpc64le-unknown-linux-gnu
-        ;;
-    mips64le)
-        export DOCKER_ARCH=mips64le
-        export RUST_TRIPLET=mips64el-unknown-linux-gnuabi64
-        ;;
-    s390x)
-        export DOCKER_ARCH=s390x
-        export RUST_TRIPLET=s390x-unknown-linux-gnu
-        ;;
-    *)
-        echo "ERROR: could not determine architecture settings. PLEASE FIX ME"
-        exit 1
-        ;;
-esac
-
-#
-# Print debug info
-#
-
 echo "#~~~~~~~~~~~~~~~~~~~~"
 echo "$0 variables:"
 echo "nproc: $(nproc)"
+echo "ZT_NAME: ${ZT_NAME}"
+echo "DISTRO: ${DISTRO}"
 echo "ZT_ISA: ${ZT_ISA}"
-echo "DOCKER_ARCH: ${DOCKER_ARCH}"
-echo "RUST_TRIPLET: ${RUST_TRIPLET}"
 echo "VERSION: ${VERSION}"
-echo "EVENT: ${EVENT}"
+echo "BUILD_EVENT: ${BUILD_EVENT}"
+echo "DOCKER_ARCH: ${DOCKER_ARCH}"
+echo "DNF_ARCH: ${DNF_ARCH}"
+echo "RUST_TRIPLET: ${RUST_TRIPLET}"
 echo "PKGFMT: ${PKGFMT}"
 echo "PWD: ${PWD}"
 echo "DOCKERFILE: ${DOCKERFILE}"
 echo "#~~~~~~~~~~~~~~~~~~~~"
 
-#
-# Munge RPM and Deb
-#
+make munge_rpm zerotier-one.spec VERSION=${VERSION}
+make munge_deb debian/changelog VERSION=${VERSION}
 
-if [ ${PKGFMT} != "none" ] && [ ${EVENT} != "tag" ]; then
-    make munge_rpm zerotier-one.spec VERSION=${VERSION}
-    make munge_deb debian/changelog VERSION=${VERSION}
-fi
-
-#
-# Assemble buildx arguments
-#
-
-build_args=(
-    --no-cache
-    --build-arg PLATFORM=${PLATFORM}
-    --build-arg RUST_TRIPLET=${RUST_TRIPLET}
-    --build-arg DOCKER_ARCH=${DOCKER_ARCH}
-    --platform linux/${DOCKER_ARCH}
-    -f ${DOCKERFILE}
-    -t build
-    .
-)
-
-if [ ${PKGFMT} != "none" ]; then
-    build_args+=("--output type=local,dest=.")
-    build_args+=("--target export")
-fi
-
-#
-# Do build
-#
-
-docker buildx build ${build_args[@]}
+docker buildx build \
+       --no-cache=true \
+       --build-arg ZT_NAME="${ZT_NAME}" \
+       --build-arg RUST_TRIPLET="${RUST_TRIPLET}" \
+       --build-arg DOCKER_ARCH="${DOCKER_ARCH}" \
+       --build-arg DNF_ARCH="${DNF_ARCH}" \
+       --platform linux/${DOCKER_ARCH} \
+       -f ${DOCKERFILE} \
+       -t build \
+       . \
+       --output type=local,dest=. \
+       --target export