Merge pull request #14 from saschpe/saschpe.docker-context

Use system-default Docker context going forward

Author: saschpe

scripts/build

@@ -7,7 +7,6 @@ SCRIPT_DIR=$(cd -- "$(dirname -- "${0}")" && pwd)
 . "${SCRIPT_DIR}/inc.functions"
 
 # Default values
-BUILDX_BUILDER_NAME=main
 DEFAULT_ANDROID=$(grep android= "${SCRIPT_DIR}/../Dockerfile" | cut -d"=" -f2)
 DEFAULT_CMAKE=$(grep cmake= "${SCRIPT_DIR}/../Dockerfile" | cut -d"=" -f2)
 DEFAULT_JDK=$(grep jdk= "${SCRIPT_DIR}/../Dockerfile" | cut -d"=" -f2)
@@ -23,7 +22,6 @@ usage() {
   printf "  --jdk VERSION       (default: %s)\n" "${DEFAULT_JDK}"
   printf "  --ndk VERSION       (default: %s)\n" "${DEFAULT_NDK}"
   printf "  --platforms         (default: %s)\n" "${DEFAULT_PLATFORMS}"
-  printf "  --clean             (optional, clean up build context afterwards)\n"
   printf "  --push              (optional, upload images to Docker Hub)\n"
   exit 1
 }
@@ -34,7 +32,6 @@ cmake="${DEFAULT_CMAKE}"
 jdk="${DEFAULT_JDK}"
 ndk="${DEFAULT_NDK}"
 platforms="${DEFAULT_PLATFORMS}"
-cmd_clean=
 cmd_push=
 while [ $# -gt 0 ]; do
   key="$1"
@@ -43,9 +40,6 @@ while [ $# -gt 0 ]; do
     android="$2"
     shift # past argument
     ;;
-  --clean)
-    cmd_clean=true
-    ;;
   --cmake)
     cmake="$2"
     shift # past argument
@@ -82,21 +76,6 @@ if [ ${cmd_push} ]; then
   buildx_command="--push"
 fi
 
-if [ ${cmd_clean} ]; then
-  cleanup() {
-    if docker buildx ls | grep -q ${BUILDX_BUILDER_NAME}; then
-      approve "Remove buildx builder '${BUILDX_BUILDER_NAME}'"
-      safe docker buildx rm ${BUILDX_BUILDER_NAME}
-    fi
-  }
-  trap cleanup EXIT
-fi
-
-if ! docker buildx ls | grep -q ${BUILDX_BUILDER_NAME}; then
-  approve "Create buildx builder '${BUILDX_BUILDER_NAME}'"
-  safe docker buildx create --name ${BUILDX_BUILDER_NAME}
-fi
-
 if [ ${cmd_push} ]; then
   approve "Build and push image '${image_tag}'"
   buildx_command="--push"
@@ -107,7 +86,6 @@ fi
 safe docker buildx build \
   --platform "${platforms}" \
   ${buildx_command} \
-  --builder ${BUILDX_BUILDER_NAME} \
   --build-arg android="${android}" \
   --build-arg cmake="${cmake}" \
   --build-arg jdk="${jdk}" \