rework docker scripts for multi-platform builds

docker.sh

@@ -4,126 +4,178 @@ set -euo pipefail
 export DH_PROJECT="openwebrxplus"
 export DH_USERNAME="slechev"
 
-export NIGHTLY_BUILD=$(date +%F)
-
-ARCH=$(uname -m)
-
 #IMAGES="${DH_PROJECT}-rtlsdr ${DH_PROJECT}-sdrplay ${DH_PROJECT}-hackrf ${DH_PROJECT}-airspy ${DH_PROJECT}-rtlsdr-soapy ${DH_PROJECT}-plutosdr ${DH_PROJECT}-limesdr ${DH_PROJECT}-soapyremote ${DH_PROJECT}-perseus ${DH_PROJECT}-fcdpp ${DH_PROJECT}-radioberry ${DH_PROJECT}-uhd ${DH_PROJECT}-rtltcp ${DH_PROJECT}-runds ${DH_PROJECT}-hpsdr ${DH_PROJECT}-bladerf ${DH_PROJECT}-full ${DH_PROJECT}"
-IMAGES="${DH_PROJECT}-full ${DH_PROJECT}"
+IMAGES="${DH_PROJECT}-full"
 
-ALL_ARCHS="x86_64 armv7l aarch64"
+ARCH=${ARCH:-$(uname -m)}
 TAG=${TAG:-"latest"}
 ARCHTAG="${TAG}-${ARCH}"
-MAKEFLAGS="${MAKEFLAGS:-"-j4"}"
+NIGHTLY_BUILD=$(date +%F)
+CORES=$(cat /proc/cpuinfo | grep processor | wc -l)
+MAKEFLAGS="${MAKEFLAGS:-"-j$CORES"}"
 
 usage () {
   echo "Usage: ${0} [command]"
   echo "Available commands:"
   echo "  help       Show this usage information"
-  echo "  buildn     Build full docker nightly image"
+  echo "  buildn     Build full docker nightly image (current sources)"
-  echo "  buildr     Build full docker release image"
+  echo "  buildr     Build full docker release image (form Marat's apt repo)"
-  echo "  pushn      Push built docker nightly image to the docker hub"
+  echo
-  echo "  pushr      Push built docker release image to the docker hub"
+  echo "Environment variables:"
-  echo "  manifest   Compile the docker hub manifest (combines arm and x86 tags into one)"
+  echo "       ARCH - build for different architecture,        ex: ARCH=arm64 ${0} buildn"
-  echo "  tag        Tag a release"
+  echo "        TAG - use different TAG (default is 'latest'), ex: TAG=mytag ${0} buildn"
+  echo "  MAKEFLAGS - set MAKEFLAGS for the compiler,          ex: MAKEFLAGS='-j12' ${0} buildn"
+}
+
+nightly () {
+  # this build method is used for multiplatform automated builds every night
+  # NOTE: this will not work with podman, since it requires specidic docker bulder
+  if docker buildx ls >/dev/null 2>&1; then
+    echo "Building with docker..."
+  else
+    echo "This cannot be done with Podman, we need docker buildx drivers."
+    exit
+  fi
+
+  # create docker builder https://docs.docker.com/build/building/multi-platform/
+  # we enable networking so the builder container has access to the host netwoerk (needed for registry)
+  echo -e "\n\nCreating docker builder for multiarch...\n\n"
+  docker buildx create --name owrxp-builder --driver docker-container --bootstrap --use --driver-opt network=host || true # ignore errors if already created
+
+  # create another docker container for local registry.
+  # we need this to store our -base image, because docker builder always try to pull the -base image
+  # from dockerhub and not use the localy present -base image for building the -full image.
+  echo -e "\n\nCreating local docker registry...\n\n"
+  docker container rm -vf registry 2>/dev/null || true # remove an existing registry container (ignoring errors)
+  docker run -d --name registry --network=host registry:2 # create new registry container
+
+  # build the -base image and store it in local registry (see the tags)
+  echo -e "\n\nBuilding the base image for AMD64, ARM64v8 and ARM32v7.\n\n"
+  time docker buildx build \
+    --platform linux/amd64,linux/arm64,linux/arm/v7 \
+    --build-arg MAKEFLAGS="$MAKEFLAGS" \
+    -t localhost:5000/${DH_PROJECT}-base:${NIGHTLY_BUILD} \
+    -t localhost:5000/${DH_PROJECT}-base \
+    --push --pull -f docker/Dockerfiles/Dockerfile-base .
+
+  GIT_HASH=$(git rev-parse --short master)
+
+  # build the -full image using the -base from LOCAL_REGISTRY
+  echo -e "\n\nBuilding the full image for AMD64, ARM64v8 and ARM32v7.\n\n"
+  time docker buildx build \
+    --platform linux/amd64,linux/arm64,linux/arm/v7 \
+    --build-arg LOCAL_REGISTRY="localhost:5000/" \
+    --build-arg GIT_HASH=${GIT_HASH} \
+    --build-arg ARCHTAG=latest \
+    --build-arg PROJECT=${DH_PROJECT} \
+    --build-arg MAKEFLAGS="$MAKEFLAGS" \
+    -t ${DH_USERNAME}/${DH_PROJECT}-nightly:${NIGHTLY_BUILD} \
+    -t ${DH_USERNAME}/${DH_PROJECT}-nightly \
+    --pull=false \
+    --push -f docker/Dockerfiles/Dockerfile-full .
+
+  echo -e "\n\nRemoving docker builder (keeping state/caches for next use)...\n\n"
+  docker buildx rm --keep-state owrxp-builder # keep state is needed to keep the caches for the next build
+
+  echo -e "\n\nRemoving local docker registry...\n\n"
+  docker container rm -vf registry
+}
+
+release () {
+  # this build method is used for multiplatform release builds
+  # NOTE: this will not work with podman, since it requires specidic docker bulder
+  if docker buildx ls >/dev/null 2>&1; then
+    echo "Building with docker..."
+  else
+    echo "This cannot be done with Podman, we need docker buildx drivers."
+    exit
+  fi
+
+  if [[ -z ${1:-} ]] ; then
+    echo "Usage: ${0} dorelease [version]"
+    echo "NOTE: The version param will be used for tagging only."
+    echo "The image will be built from the current packages in the apt-repo."
+    echo; echo;
+    return
+  fi
+
+  # create docker builder https://docs.docker.com/build/building/multi-platform/
+  # we enable networking so the builder container has access to the host netwoerk (needed for registry)
+  echo -e "\n\nCreating docker builder for multiarch...\n\n"
+  docker buildx create --name owrxp-builder --driver docker-container --bootstrap --use --driver-opt network=host || true # ignore errors if already created
+
+  echo -ne "\n\nBuilding release image: $1.\n\n"
+	docker buildx build \
+    --platform linux/amd64,linux/arm64,linux/arm/v7 \
+    --build-arg VERSION=$1 \
+    --build-arg MAKEFLAGS="$MAKEFLAGS" \
+    -t ${DH_USERNAME}/${DH_PROJECT}:${1} \
+    -t ${DH_USERNAME}/${DH_PROJECT} \
+    --pull --push -f docker/deb_based/Dockerfile .
+
+  echo -e "\n\nRemoving docker builder (keeping state/caches for next use)...\n\n"
+  docker buildx rm --keep-state owrxp-builder # keep state is needed to keep the caches for the next build
 }
 
 buildn () {
-  # build the base images
+  PLATFORM=""
-  echo -ne "\n\nBuilding the base image.\n\n"
+  if [[ "${ARCH}" != "$(uname -m)" ]]; then
-  time docker build --pull --build-arg MAKEFLAGS="$MAKEFLAGS" -t ${DH_PROJECT}-base:${ARCHTAG} -f docker/Dockerfiles/Dockerfile-base .
+    PLATFORM="--platform=linux/$ARCH"
+  fi
 
-  # AF: uncomment next 2 lines if you're building all images
+  echo -ne "\n\nBuilding the base image for $ARCH.\n\n"
+  time docker build $PLATFORM \
+    --build-arg MAKEFLAGS="$MAKEFLAGS" \
+    -t ${DH_PROJECT}-base:${ARCHTAG} \
+    --pull -f docker/Dockerfiles/Dockerfile-base .
+
+  # NOTE: uncomment next 2 lines if you're building all images
   #echo -ne "\n\nBuilding soapysdr image.\n\n"
-  #docker build --build-arg ARCHTAG=${ARCHTAG} --build-arg PROJECT=${DH_PROJECT} --build-arg MAKEFLAGS="$MAKEFLAGS" -t ${DH_PROJECT}-soapysdr-base:${ARCHTAG} -f docker/Dockerfiles/Dockerfile-soapysdr .
+  #docker build $PLATFORM --build-arg ARCHTAG=${ARCHTAG} --build-arg PROJECT=${DH_PROJECT} --build-arg MAKEFLAGS="$MAKEFLAGS" -t ${DH_PROJECT}-soapysdr-base:${ARCHTAG} -f docker/Dockerfiles/Dockerfile-soapysdr .
 
   GIT_HASH=$(git rev-parse --short master)
   for image in ${IMAGES}; do
     i=$(echo ${image} | rev | cut -d- -f1 | rev)
     # "openwebrx" is a special image that gets tag-aliased later on
     if [[ ! -z "${i}" && "${i}" != "${DH_PROJECT}" ]] ; then
-      echo -ne "\n\nBuilding ${i} image.\n\n"
+      echo -ne "\n\nBuilding ${i} image for $ARCH.\n\n"
-      docker build --build-arg GIT_HASH=${GIT_HASH} --build-arg ARCHTAG=$ARCHTAG --build-arg PROJECT=${DH_PROJECT} --build-arg MAKEFLAGS="$MAKEFLAGS" -t ${DH_USERNAME}/${image}:${ARCHTAG} -f docker/Dockerfiles/Dockerfile-${i} .
+      time docker build $PLATFORM \
+        --build-arg GIT_HASH=${GIT_HASH} \
+        --build-arg ARCHTAG=$ARCHTAG \
+        --build-arg PROJECT=${DH_PROJECT} \
+        --build-arg MAKEFLAGS="$MAKEFLAGS" \
+        -t ${DH_USERNAME}/${image}:${ARCHTAG} \
+        -f docker/Dockerfiles/Dockerfile-${i} .
     fi
   done
 
-  # tag openwebrx alias image
+  # tag full image alias image
-  docker tag ${DH_USERNAME}/${DH_PROJECT}-full:${ARCHTAG} ${DH_USERNAME}/${DH_PROJECT}:${ARCHTAG}
+  docker tag ${DH_USERNAME}/${DH_PROJECT}-full:${ARCHTAG} ${DH_USERNAME}/${DH_PROJECT}-nightly:${NIGHTLY_BUILD}
-  docker tag ${DH_USERNAME}/${DH_PROJECT}-full:${ARCHTAG} ${DH_USERNAME}/${DH_PROJECT}-full
+  docker tag ${DH_USERNAME}/${DH_PROJECT}-full:${ARCHTAG} ${DH_USERNAME}/${DH_PROJECT}-nightly
-  docker tag ${DH_USERNAME}/${DH_PROJECT}-full ${DH_USERNAME}/${DH_PROJECT}-nightly:${NIGHTLY_BUILD}
-  docker tag ${DH_USERNAME}/${DH_PROJECT}-full ${DH_USERNAME}/${DH_PROJECT}-nightly
-}
-
-pushn () {
-  #for image in ${IMAGES}; do
-  #  docker push ${DH_USERNAME}/${image}:${ARCHTAG}
-  #done
-  docker push ${DH_USERNAME}/${DH_PROJECT}-nightly:${NIGHTLY_BUILD}
-  docker push ${DH_USERNAME}/${DH_PROJECT}-nightly
 }
 
 buildr () {
   if [[ -z ${1:-} ]] ; then
     echo "Usage: ${0} buildr [version]"
-    echo "NOTE: The version will be used for tagging."
+    echo "NOTE: The version param will be used for tagging only."
-    echo "The image will be build from the current packages in the apt-repo."
+    echo "The image will be built from the current packages in the apt-repo."
     echo; echo;
     return
   fi
 
-  echo -ne "\n\nBuilding release image: $1.\n\n"
+  PLATFORM=""
-	docker build --pull --build-arg VERSION=$1 --build-arg MAKEFLAGS="$MAKEFLAGS" -t ${DH_USERNAME}/${DH_PROJECT}:${1} -f docker/deb_based/Dockerfile .
+  if [[ "${ARCH}" != "$(uname -m)" ]]; then
-
+    PLATFORM="--platform=linux/$ARCH"
-  docker tag ${DH_USERNAME}/${DH_PROJECT}:${1} ${DH_USERNAME}/${DH_PROJECT}
-}
-
-pushr () {
-  if [[ -z ${1:-} ]] ; then
-    echo "Usage: ${0} pushr [version]"
-    echo; echo;
-    return
-  fi
-  docker push ${DH_USERNAME}/${DH_PROJECT}:${1}
-  docker push ${DH_USERNAME}/${DH_PROJECT}
-}
-
-
-manifest () {
-  for image in ${IMAGES}; do
-    # there's no docker manifest rm command, and the create --amend does not work, so we have to clean up manually
-    rm -rf "${HOME}/.docker/manifests/docker.io_${DH_USERNAME}_${image}-${TAG}"
-    IMAGE_LIST=""
-    for a in ${ALL_ARCHS}; do
-      IMAGE_LIST="${IMAGE_LIST} ${DH_USERNAME}/${image}:${TAG}-${a}"
-    done
-    docker manifest create ${DH_USERNAME}/${image}:${TAG} ${IMAGE_LIST}
-    docker manifest push --purge ${DH_USERNAME}/${image}:${TAG}
-  done
-}
-
-tag () {
-  if [[ -x ${1:-} || -z ${2:-} ]] ; then
-    echo "Usage: ${0} tag [SRC_TAG] [TARGET_TAG]"
-    return
   fi
 
-  local SRC_TAG=${1}
+  echo -ne "\n\nBuilding release image for $ARCH: $1.\n\n"
-  local TARGET_TAG=${2}
+	docker build $PLATFORM \
-
+    --build-arg VERSION=$1 \
-  for image in ${IMAGES}; do
+    --build-arg MAKEFLAGS="$MAKEFLAGS" \
-    # there's no docker manifest rm command, and the create --amend does not work, so we have to clean up manually
+    -t ${DH_USERNAME}/${DH_PROJECT}:${1}-${ARCH} \
-    rm -rf "${HOME}/.docker/manifests/docker.io_${DH_USERNAME}_${image}-${TARGET_TAG}"
+    -t ${DH_USERNAME}/${DH_PROJECT}:${1} \
-    IMAGE_LIST=""
+    -t ${DH_USERNAME}/${DH_PROJECT} \
-    for a in ${ALL_ARCHS}; do
+    --pull -f docker/deb_based/Dockerfile .
-      docker pull ${DH_USERNAME}/${image}:${SRC_TAG}-${a}
-      docker tag ${DH_USERNAME}/${image}:${SRC_TAG}-${a} ${DH_USERNAME}/${image}:${TARGET_TAG}-${a}
-      docker push ${DH_USERNAME}/${image}:${TARGET_TAG}-${a}
-      IMAGE_LIST="${IMAGE_LIST} ${DH_USERNAME}/${image}:${TARGET_TAG}-${a}"
-    done
-    docker manifest create ${DH_USERNAME}/${image}:${TARGET_TAG} ${IMAGE_LIST}
-    docker manifest push --purge ${DH_USERNAME}/${image}:${TARGET_TAG}
-    docker pull ${DH_USERNAME}/${image}:${TARGET_TAG}
-  done
 }
 
 dev () {
@@ -136,35 +188,16 @@ dev () {
 }
 
 run () {
-  docker run --rm -it -p 8073:8073 --device /dev/bus/usb openwebrxplus-full:latest-x86_64
+  docker run --rm -it -p 8073:8073 --device /dev/bus/usb openwebrxplus-full:latest-${ARCH}
 }
 
 case ${1:-} in
-  buildn)
+  build) buildn ;; # alias for buildn
-    buildn
+  buildn) buildn ;;
-    ;;
+  buildr) buildr ${@:2} ;;
-  pushn)
+  dev) dev ${@:2} ;;
-    pushn
+  run) run ;;
-    ;;
+  donightly) nightly ;;
-  buildr)
+  dorelease) release ${@:2} ;;
-    buildr ${@:2}
+  *) usage ;;
-    ;;
-  pushr)
-    pushr ${@:2}
-    ;;
-  manifest)
-    manifest
-    ;;
-  tag)
-    tag ${@:2}
-    ;;
-  dev)
-    dev ${@:2}
-    ;;
-  run)
-    run
-    ;;
-  *)
-    usage
-    ;;
 esac

docker/Dockerfiles/Dockerfile-full

@@ -1,6 +1,7 @@
 ARG ARCHTAG
 ARG PROJECT
-FROM ${PROJECT}-base:$ARCHTAG
+ARG LOCAL_REGISTRY
+FROM ${LOCAL_REGISTRY}${PROJECT}-base:$ARCHTAG
 ARG MAKEFLAGS
 
 COPY docker/scripts/install-*.sh \

docker/deb_based/Dockerfile

@@ -1,6 +1,7 @@
 FROM debian:bullseye-slim
 ARG VERSION
 LABEL OpenWebRX+ with All Receivers and Demodulators
+ARG MAKEFLAGS
 
 ADD docker/files /files
 

docker/scripts/install-130-dependencies-uhd.sh

@@ -46,7 +46,7 @@ if [[ -z ${1:-} ]]; then
       cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_UTILS=OFF -DENABLE_PYTHON_API=OFF -DENABLE_EXAMPLES=OFF -DENABLE_TESTS=OFF -DENABLE_OCTOCLOCK=OFF -DENABLE_MAN_PAGES=OFF -DSTRIP_BINARIES=ON ..
       ;;
   esac
-  make
+  MAKEFLAGS="-j2" make
   make install
   cd ../../..
   rm -rf uhd

docker/scripts/install-140-dependencies-hpsdr.sh

@@ -36,6 +36,7 @@ if [[ -z ${1:-} ]]; then
 
   rm -rf hpsdrconnector
   rm -rf go
+  rm -rf ~/go ~/.cache
   rm $PACKAGE
 fi