diff --git a/.gitignore b/.gitignore
index 47d474d..30d08f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -605,4 +605,5 @@ pkg/**/aaru
 
 .sonarqube
 
-build/*
\ No newline at end of file
+build/*
+docker/*
diff --git a/docker/dockcross-android-arm b/docker/dockcross-android-arm
deleted file mode 100755
index 51e1add..0000000
--- a/docker/dockcross-android-arm
+++ /dev/null
@@ -1,278 +0,0 @@
-#!/usr/bin/env bash
-
-DEFAULT_DOCKCROSS_IMAGE=dockcross/android-arm:latest
-
-#------------------------------------------------------------------------------
-# Helpers
-#
-err() {
-    echo -e >&2 "ERROR: $*\n"
-}
-
-die() {
-    err "$*"
-    exit 1
-}
-
-has() {
-    # eg. has command update
-    local kind=$1
-    local name=$2
-
-    type -t $kind:$name | grep -q function
-}
-
-# If OCI_EXE is not already set, search for a container executor (OCI stands for "Open Container Initiative")
-if [ -z "$OCI_EXE" ]; then
-    if which docker >/dev/null 2>/dev/null; then
-        OCI_EXE=docker
-    elif which podman >/dev/null 2>/dev/null; then
-        OCI_EXE=podman
-    else
-        die "Cannot find a container executor. Search for docker and podman."
-    fi
-fi
-
-#------------------------------------------------------------------------------
-# Command handlers
-#
-command:update-image() {
-    $OCI_EXE pull $FINAL_IMAGE
-}
-
-help:update-image() {
-    echo "Pull the latest $FINAL_IMAGE ."
-}
-
-command:update-script() {
-    if cmp -s <( $OCI_EXE run --rm $FINAL_IMAGE ) $0; then
-        echo "$0 is up to date"
-    else
-        echo -n "Updating $0 ... "
-        $OCI_EXE run --rm $FINAL_IMAGE > $0 && echo ok
-    fi
-}
-
-help:update-image() {
-    echo "Update $0 from $FINAL_IMAGE ."
-}
-
-command:update() {
-    command:update-image
-    command:update-script
-}
-
-help:update() {
-    echo "Pull the latest $FINAL_IMAGE, and then update $0 from that."
-}
-
-command:help() {
-    if [[ $# != 0 ]]; then
-        if ! has command $1; then
-            err \"$1\" is not an dockcross command
-            command:help
-        elif ! has help $1; then
-            err No help found for \"$1\"
-        else
-            help:$1
-        fi
-    else
-        cat >&2 <<ENDHELP
-Usage: dockcross [options] [--] command [args]
-
-By default, run the given *command* in an dockcross Docker container.
-
-The *options* can be one of:
-
-    --args|-a           Extra args to the *docker run* command
-    --image|-i          Docker cross-compiler image to use
-    --config|-c         Bash script to source before running this script
-
-
-Additionally, there are special update commands:
-
-    update-image
-    update-script
-    update
-
-For update command help use: $0 help <command>
-ENDHELP
-        exit 1
-    fi
-}
-
-#------------------------------------------------------------------------------
-# Option processing
-#
-special_update_command=''
-while [[ $# != 0 ]]; do
-    case $1 in
-
-        --)
-            shift
-            break
-            ;;
-
-        --args|-a)
-            ARG_ARGS="$2"
-            shift 2
-            ;;
-
-        --config|-c)
-            ARG_CONFIG="$2"
-            shift 2
-            ;;
-
-        --image|-i)
-            ARG_IMAGE="$2"
-            shift 2
-            ;;
-        update|update-image|update-script)
-            special_update_command=$1
-            break
-            ;;
-        -*)
-            err Unknown option \"$1\"
-            command:help
-            exit
-            ;;
-
-        *)
-            break
-            ;;
-
-    esac
-done
-
-# The precedence for options is:
-# 1. command-line arguments
-# 2. environment variables
-# 3. defaults
-
-# Source the config file if it exists
-DEFAULT_DOCKCROSS_CONFIG=~/.dockcross
-FINAL_CONFIG=${ARG_CONFIG-${DOCKCROSS_CONFIG-$DEFAULT_DOCKCROSS_CONFIG}}
-
-[[ -f "$FINAL_CONFIG" ]] && source "$FINAL_CONFIG"
-
-# Set the docker image
-FINAL_IMAGE=${ARG_IMAGE-${DOCKCROSS_IMAGE-$DEFAULT_DOCKCROSS_IMAGE}}
-
-# Handle special update command
-if [ "$special_update_command" != "" ]; then
-    case $special_update_command in
-
-        update)
-            command:update
-            exit $?
-            ;;
-
-        update-image)
-            command:update-image
-            exit $?
-            ;;
-
-        update-script)
-            command:update-script
-            exit $?
-            ;;
-
-    esac
-fi
-
-# Set the docker run extra args (if any)
-FINAL_ARGS=${ARG_ARGS-${DOCKCROSS_ARGS}}
-
-# Bash on Ubuntu on Windows
-UBUNTU_ON_WINDOWS=$([ -e /proc/version ] && grep -l Microsoft /proc/version || echo "")
-# MSYS, Git Bash, etc.
-MSYS=$([ -e /proc/version ] && grep -l MINGW /proc/version || echo "")
-# CYGWIN
-CYGWIN=$([ -e /proc/version ] && grep -l CYGWIN /proc/version || echo "")
-
-if [ -z "$UBUNTU_ON_WINDOWS" -a -z "$MSYS" ]; then
-    USER_IDS=(-e BUILDER_UID="$( id -u )" -e BUILDER_GID="$( id -g )" -e BUILDER_USER="$( id -un )" -e BUILDER_GROUP="$( id -gn )")
-fi
-
-# Change the PWD when working in Docker on Windows
-if [ -n "$UBUNTU_ON_WINDOWS" ]; then
-    WSL_ROOT="/mnt/"
-    CFG_FILE=/etc/wsl.conf
-	if [ -f "$CFG_FILE" ]; then
-		CFG_CONTENT=$(cat $CFG_FILE | sed -r '/[^=]+=[^=]+/!d' | sed -r 's/\s+=\s/=/g')
-		eval "$CFG_CONTENT"
-		if [ -n "$root" ]; then
-			WSL_ROOT=$root
-		fi
-	fi
-    HOST_PWD=`pwd -P`
-    HOST_PWD=${HOST_PWD/$WSL_ROOT//}
-elif [ -n "$MSYS" ]; then
-    HOST_PWD=$PWD
-    HOST_PWD=${HOST_PWD/\//}
-    HOST_PWD=${HOST_PWD/\//:\/}
-elif [ -n "$CYGWIN" ]; then
-    for f in pwd readlink cygpath ; do
-        test -n "$(type "${f}" )" || { echo >&2 "Missing functionality (${f}) (in cygwin)." ; exit 1 ; } ;
-    done ;
-    HOST_PWD="$( cygpath -w "$( readlink -f "$( pwd ;)" ; )" ; )" ;
-else
-    HOST_PWD=$PWD
-    [ -L $HOST_PWD ] && HOST_PWD=$(readlink $HOST_PWD)
-fi
-
-# Mount Additional Volumes
-if [ -z "$SSH_DIR" ]; then
-    SSH_DIR="$HOME/.ssh"
-fi
-
-HOST_VOLUMES=
-if [ -e "$SSH_DIR" -a -z "$MSYS" ]; then
-    if test -n "${CYGWIN}" ; then
-      HOST_VOLUMES+="-v $(cygpath -w ${SSH_DIR} ; ):/home/$(id -un)/.ssh" ;
-    else
-      HOST_VOLUMES+="-v $SSH_DIR:/home/$(id -un)/.ssh" ;
-    fi ;
-fi
-
-#------------------------------------------------------------------------------
-# Now, finally, run the command in a container
-#
-TTY_ARGS=
-tty -s && [ -z "$MSYS" ] && TTY_ARGS=-ti
-CONTAINER_NAME=dockcross_$RANDOM
-$OCI_EXE run $TTY_ARGS --name $CONTAINER_NAME \
-    -v "$HOST_PWD":/work \
-    $HOST_VOLUMES \
-    "${USER_IDS[@]}" \
-    $FINAL_ARGS \
-    $FINAL_IMAGE "$@"
-run_exit_code=$?
-
-# Attempt to delete container
-rm_output=$($OCI_EXE rm -f $CONTAINER_NAME 2>&1)
-rm_exit_code=$?
-if [[ $rm_exit_code != 0 ]]; then
-  if [[ "$CIRCLECI" == "true" ]] && [[ $rm_output == *"Driver btrfs failed to remove"* ]]; then
-    : # Ignore error because of https://circleci.com/docs/docker-btrfs-error/
-  else
-    echo "$rm_output"
-    exit $rm_exit_code
-  fi
-fi
-
-exit $run_exit_code
-
-################################################################################
-#
-# This image is not intended to be run manually.
-#
-# To create a dockcross helper script for the
-# dockcross/android-arm:latest image, run:
-#
-# docker run --rm dockcross/android-arm:latest > dockcross-android-arm-latest
-# chmod +x dockcross-android-arm-latest
-#
-# You may then wish to move the dockcross script to your PATH.
-#
-################################################################################
diff --git a/docker/dockcross-android-arm64 b/docker/dockcross-android-arm64
deleted file mode 100755
index 4896a78..0000000
--- a/docker/dockcross-android-arm64
+++ /dev/null
@@ -1,278 +0,0 @@
-#!/usr/bin/env bash
-
-DEFAULT_DOCKCROSS_IMAGE=dockcross/android-arm64:latest
-
-#------------------------------------------------------------------------------
-# Helpers
-#
-err() {
-    echo -e >&2 "ERROR: $*\n"
-}
-
-die() {
-    err "$*"
-    exit 1
-}
-
-has() {
-    # eg. has command update
-    local kind=$1
-    local name=$2
-
-    type -t $kind:$name | grep -q function
-}
-
-# If OCI_EXE is not already set, search for a container executor (OCI stands for "Open Container Initiative")
-if [ -z "$OCI_EXE" ]; then
-    if which docker >/dev/null 2>/dev/null; then
-        OCI_EXE=docker
-    elif which podman >/dev/null 2>/dev/null; then
-        OCI_EXE=podman
-    else
-        die "Cannot find a container executor. Search for docker and podman."
-    fi
-fi
-
-#------------------------------------------------------------------------------
-# Command handlers
-#
-command:update-image() {
-    $OCI_EXE pull $FINAL_IMAGE
-}
-
-help:update-image() {
-    echo "Pull the latest $FINAL_IMAGE ."
-}
-
-command:update-script() {
-    if cmp -s <( $OCI_EXE run --rm $FINAL_IMAGE ) $0; then
-        echo "$0 is up to date"
-    else
-        echo -n "Updating $0 ... "
-        $OCI_EXE run --rm $FINAL_IMAGE > $0 && echo ok
-    fi
-}
-
-help:update-image() {
-    echo "Update $0 from $FINAL_IMAGE ."
-}
-
-command:update() {
-    command:update-image
-    command:update-script
-}
-
-help:update() {
-    echo "Pull the latest $FINAL_IMAGE, and then update $0 from that."
-}
-
-command:help() {
-    if [[ $# != 0 ]]; then
-        if ! has command $1; then
-            err \"$1\" is not an dockcross command
-            command:help
-        elif ! has help $1; then
-            err No help found for \"$1\"
-        else
-            help:$1
-        fi
-    else
-        cat >&2 <<ENDHELP
-Usage: dockcross [options] [--] command [args]
-
-By default, run the given *command* in an dockcross Docker container.
-
-The *options* can be one of:
-
-    --args|-a           Extra args to the *docker run* command
-    --image|-i          Docker cross-compiler image to use
-    --config|-c         Bash script to source before running this script
-
-
-Additionally, there are special update commands:
-
-    update-image
-    update-script
-    update
-
-For update command help use: $0 help <command>
-ENDHELP
-        exit 1
-    fi
-}
-
-#------------------------------------------------------------------------------
-# Option processing
-#
-special_update_command=''
-while [[ $# != 0 ]]; do
-    case $1 in
-
-        --)
-            shift
-            break
-            ;;
-
-        --args|-a)
-            ARG_ARGS="$2"
-            shift 2
-            ;;
-
-        --config|-c)
-            ARG_CONFIG="$2"
-            shift 2
-            ;;
-
-        --image|-i)
-            ARG_IMAGE="$2"
-            shift 2
-            ;;
-        update|update-image|update-script)
-            special_update_command=$1
-            break
-            ;;
-        -*)
-            err Unknown option \"$1\"
-            command:help
-            exit
-            ;;
-
-        *)
-            break
-            ;;
-
-    esac
-done
-
-# The precedence for options is:
-# 1. command-line arguments
-# 2. environment variables
-# 3. defaults
-
-# Source the config file if it exists
-DEFAULT_DOCKCROSS_CONFIG=~/.dockcross
-FINAL_CONFIG=${ARG_CONFIG-${DOCKCROSS_CONFIG-$DEFAULT_DOCKCROSS_CONFIG}}
-
-[[ -f "$FINAL_CONFIG" ]] && source "$FINAL_CONFIG"
-
-# Set the docker image
-FINAL_IMAGE=${ARG_IMAGE-${DOCKCROSS_IMAGE-$DEFAULT_DOCKCROSS_IMAGE}}
-
-# Handle special update command
-if [ "$special_update_command" != "" ]; then
-    case $special_update_command in
-
-        update)
-            command:update
-            exit $?
-            ;;
-
-        update-image)
-            command:update-image
-            exit $?
-            ;;
-
-        update-script)
-            command:update-script
-            exit $?
-            ;;
-
-    esac
-fi
-
-# Set the docker run extra args (if any)
-FINAL_ARGS=${ARG_ARGS-${DOCKCROSS_ARGS}}
-
-# Bash on Ubuntu on Windows
-UBUNTU_ON_WINDOWS=$([ -e /proc/version ] && grep -l Microsoft /proc/version || echo "")
-# MSYS, Git Bash, etc.
-MSYS=$([ -e /proc/version ] && grep -l MINGW /proc/version || echo "")
-# CYGWIN
-CYGWIN=$([ -e /proc/version ] && grep -l CYGWIN /proc/version || echo "")
-
-if [ -z "$UBUNTU_ON_WINDOWS" -a -z "$MSYS" ]; then
-    USER_IDS=(-e BUILDER_UID="$( id -u )" -e BUILDER_GID="$( id -g )" -e BUILDER_USER="$( id -un )" -e BUILDER_GROUP="$( id -gn )")
-fi
-
-# Change the PWD when working in Docker on Windows
-if [ -n "$UBUNTU_ON_WINDOWS" ]; then
-    WSL_ROOT="/mnt/"
-    CFG_FILE=/etc/wsl.conf
-	if [ -f "$CFG_FILE" ]; then
-		CFG_CONTENT=$(cat $CFG_FILE | sed -r '/[^=]+=[^=]+/!d' | sed -r 's/\s+=\s/=/g')
-		eval "$CFG_CONTENT"
-		if [ -n "$root" ]; then
-			WSL_ROOT=$root
-		fi
-	fi
-    HOST_PWD=`pwd -P`
-    HOST_PWD=${HOST_PWD/$WSL_ROOT//}
-elif [ -n "$MSYS" ]; then
-    HOST_PWD=$PWD
-    HOST_PWD=${HOST_PWD/\//}
-    HOST_PWD=${HOST_PWD/\//:\/}
-elif [ -n "$CYGWIN" ]; then
-    for f in pwd readlink cygpath ; do
-        test -n "$(type "${f}" )" || { echo >&2 "Missing functionality (${f}) (in cygwin)." ; exit 1 ; } ;
-    done ;
-    HOST_PWD="$( cygpath -w "$( readlink -f "$( pwd ;)" ; )" ; )" ;
-else
-    HOST_PWD=$PWD
-    [ -L $HOST_PWD ] && HOST_PWD=$(readlink $HOST_PWD)
-fi
-
-# Mount Additional Volumes
-if [ -z "$SSH_DIR" ]; then
-    SSH_DIR="$HOME/.ssh"
-fi
-
-HOST_VOLUMES=
-if [ -e "$SSH_DIR" -a -z "$MSYS" ]; then
-    if test -n "${CYGWIN}" ; then
-      HOST_VOLUMES+="-v $(cygpath -w ${SSH_DIR} ; ):/home/$(id -un)/.ssh" ;
-    else
-      HOST_VOLUMES+="-v $SSH_DIR:/home/$(id -un)/.ssh" ;
-    fi ;
-fi
-
-#------------------------------------------------------------------------------
-# Now, finally, run the command in a container
-#
-TTY_ARGS=
-tty -s && [ -z "$MSYS" ] && TTY_ARGS=-ti
-CONTAINER_NAME=dockcross_$RANDOM
-$OCI_EXE run $TTY_ARGS --name $CONTAINER_NAME \
-    -v "$HOST_PWD":/work \
-    $HOST_VOLUMES \
-    "${USER_IDS[@]}" \
-    $FINAL_ARGS \
-    $FINAL_IMAGE "$@"
-run_exit_code=$?
-
-# Attempt to delete container
-rm_output=$($OCI_EXE rm -f $CONTAINER_NAME 2>&1)
-rm_exit_code=$?
-if [[ $rm_exit_code != 0 ]]; then
-  if [[ "$CIRCLECI" == "true" ]] && [[ $rm_output == *"Driver btrfs failed to remove"* ]]; then
-    : # Ignore error because of https://circleci.com/docs/docker-btrfs-error/
-  else
-    echo "$rm_output"
-    exit $rm_exit_code
-  fi
-fi
-
-exit $run_exit_code
-
-################################################################################
-#
-# This image is not intended to be run manually.
-#
-# To create a dockcross helper script for the
-# dockcross/android-arm64:latest image, run:
-#
-# docker run --rm dockcross/android-arm64:latest > dockcross-android-arm64-latest
-# chmod +x dockcross-android-arm64-latest
-#
-# You may then wish to move the dockcross script to your PATH.
-#
-################################################################################
diff --git a/docker/dockcross-android-x64 b/docker/dockcross-android-x64
deleted file mode 100755
index 00b7d84..0000000
--- a/docker/dockcross-android-x64
+++ /dev/null
@@ -1,278 +0,0 @@
-#!/usr/bin/env bash
-
-DEFAULT_DOCKCROSS_IMAGE=dockcross/android-x86_64:latest
-
-#------------------------------------------------------------------------------
-# Helpers
-#
-err() {
-    echo -e >&2 "ERROR: $*\n"
-}
-
-die() {
-    err "$*"
-    exit 1
-}
-
-has() {
-    # eg. has command update
-    local kind=$1
-    local name=$2
-
-    type -t $kind:$name | grep -q function
-}
-
-# If OCI_EXE is not already set, search for a container executor (OCI stands for "Open Container Initiative")
-if [ -z "$OCI_EXE" ]; then
-    if which docker >/dev/null 2>/dev/null; then
-        OCI_EXE=docker
-    elif which podman >/dev/null 2>/dev/null; then
-        OCI_EXE=podman
-    else
-        die "Cannot find a container executor. Search for docker and podman."
-    fi
-fi
-
-#------------------------------------------------------------------------------
-# Command handlers
-#
-command:update-image() {
-    $OCI_EXE pull $FINAL_IMAGE
-}
-
-help:update-image() {
-    echo "Pull the latest $FINAL_IMAGE ."
-}
-
-command:update-script() {
-    if cmp -s <( $OCI_EXE run --rm $FINAL_IMAGE ) $0; then
-        echo "$0 is up to date"
-    else
-        echo -n "Updating $0 ... "
-        $OCI_EXE run --rm $FINAL_IMAGE > $0 && echo ok
-    fi
-}
-
-help:update-image() {
-    echo "Update $0 from $FINAL_IMAGE ."
-}
-
-command:update() {
-    command:update-image
-    command:update-script
-}
-
-help:update() {
-    echo "Pull the latest $FINAL_IMAGE, and then update $0 from that."
-}
-
-command:help() {
-    if [[ $# != 0 ]]; then
-        if ! has command $1; then
-            err \"$1\" is not an dockcross command
-            command:help
-        elif ! has help $1; then
-            err No help found for \"$1\"
-        else
-            help:$1
-        fi
-    else
-        cat >&2 <<ENDHELP
-Usage: dockcross [options] [--] command [args]
-
-By default, run the given *command* in an dockcross Docker container.
-
-The *options* can be one of:
-
-    --args|-a           Extra args to the *docker run* command
-    --image|-i          Docker cross-compiler image to use
-    --config|-c         Bash script to source before running this script
-
-
-Additionally, there are special update commands:
-
-    update-image
-    update-script
-    update
-
-For update command help use: $0 help <command>
-ENDHELP
-        exit 1
-    fi
-}
-
-#------------------------------------------------------------------------------
-# Option processing
-#
-special_update_command=''
-while [[ $# != 0 ]]; do
-    case $1 in
-
-        --)
-            shift
-            break
-            ;;
-
-        --args|-a)
-            ARG_ARGS="$2"
-            shift 2
-            ;;
-
-        --config|-c)
-            ARG_CONFIG="$2"
-            shift 2
-            ;;
-
-        --image|-i)
-            ARG_IMAGE="$2"
-            shift 2
-            ;;
-        update|update-image|update-script)
-            special_update_command=$1
-            break
-            ;;
-        -*)
-            err Unknown option \"$1\"
-            command:help
-            exit
-            ;;
-
-        *)
-            break
-            ;;
-
-    esac
-done
-
-# The precedence for options is:
-# 1. command-line arguments
-# 2. environment variables
-# 3. defaults
-
-# Source the config file if it exists
-DEFAULT_DOCKCROSS_CONFIG=~/.dockcross
-FINAL_CONFIG=${ARG_CONFIG-${DOCKCROSS_CONFIG-$DEFAULT_DOCKCROSS_CONFIG}}
-
-[[ -f "$FINAL_CONFIG" ]] && source "$FINAL_CONFIG"
-
-# Set the docker image
-FINAL_IMAGE=${ARG_IMAGE-${DOCKCROSS_IMAGE-$DEFAULT_DOCKCROSS_IMAGE}}
-
-# Handle special update command
-if [ "$special_update_command" != "" ]; then
-    case $special_update_command in
-
-        update)
-            command:update
-            exit $?
-            ;;
-
-        update-image)
-            command:update-image
-            exit $?
-            ;;
-
-        update-script)
-            command:update-script
-            exit $?
-            ;;
-
-    esac
-fi
-
-# Set the docker run extra args (if any)
-FINAL_ARGS=${ARG_ARGS-${DOCKCROSS_ARGS}}
-
-# Bash on Ubuntu on Windows
-UBUNTU_ON_WINDOWS=$([ -e /proc/version ] && grep -l Microsoft /proc/version || echo "")
-# MSYS, Git Bash, etc.
-MSYS=$([ -e /proc/version ] && grep -l MINGW /proc/version || echo "")
-# CYGWIN
-CYGWIN=$([ -e /proc/version ] && grep -l CYGWIN /proc/version || echo "")
-
-if [ -z "$UBUNTU_ON_WINDOWS" -a -z "$MSYS" ]; then
-    USER_IDS=(-e BUILDER_UID="$( id -u )" -e BUILDER_GID="$( id -g )" -e BUILDER_USER="$( id -un )" -e BUILDER_GROUP="$( id -gn )")
-fi
-
-# Change the PWD when working in Docker on Windows
-if [ -n "$UBUNTU_ON_WINDOWS" ]; then
-    WSL_ROOT="/mnt/"
-    CFG_FILE=/etc/wsl.conf
-	if [ -f "$CFG_FILE" ]; then
-		CFG_CONTENT=$(cat $CFG_FILE | sed -r '/[^=]+=[^=]+/!d' | sed -r 's/\s+=\s/=/g')
-		eval "$CFG_CONTENT"
-		if [ -n "$root" ]; then
-			WSL_ROOT=$root
-		fi
-	fi
-    HOST_PWD=`pwd -P`
-    HOST_PWD=${HOST_PWD/$WSL_ROOT//}
-elif [ -n "$MSYS" ]; then
-    HOST_PWD=$PWD
-    HOST_PWD=${HOST_PWD/\//}
-    HOST_PWD=${HOST_PWD/\//:\/}
-elif [ -n "$CYGWIN" ]; then
-    for f in pwd readlink cygpath ; do
-        test -n "$(type "${f}" )" || { echo >&2 "Missing functionality (${f}) (in cygwin)." ; exit 1 ; } ;
-    done ;
-    HOST_PWD="$( cygpath -w "$( readlink -f "$( pwd ;)" ; )" ; )" ;
-else
-    HOST_PWD=$PWD
-    [ -L $HOST_PWD ] && HOST_PWD=$(readlink $HOST_PWD)
-fi
-
-# Mount Additional Volumes
-if [ -z "$SSH_DIR" ]; then
-    SSH_DIR="$HOME/.ssh"
-fi
-
-HOST_VOLUMES=
-if [ -e "$SSH_DIR" -a -z "$MSYS" ]; then
-    if test -n "${CYGWIN}" ; then
-      HOST_VOLUMES+="-v $(cygpath -w ${SSH_DIR} ; ):/home/$(id -un)/.ssh" ;
-    else
-      HOST_VOLUMES+="-v $SSH_DIR:/home/$(id -un)/.ssh" ;
-    fi ;
-fi
-
-#------------------------------------------------------------------------------
-# Now, finally, run the command in a container
-#
-TTY_ARGS=
-tty -s && [ -z "$MSYS" ] && TTY_ARGS=-ti
-CONTAINER_NAME=dockcross_$RANDOM
-$OCI_EXE run $TTY_ARGS --name $CONTAINER_NAME \
-    -v "$HOST_PWD":/work \
-    $HOST_VOLUMES \
-    "${USER_IDS[@]}" \
-    $FINAL_ARGS \
-    $FINAL_IMAGE "$@"
-run_exit_code=$?
-
-# Attempt to delete container
-rm_output=$($OCI_EXE rm -f $CONTAINER_NAME 2>&1)
-rm_exit_code=$?
-if [[ $rm_exit_code != 0 ]]; then
-  if [[ "$CIRCLECI" == "true" ]] && [[ $rm_output == *"Driver btrfs failed to remove"* ]]; then
-    : # Ignore error because of https://circleci.com/docs/docker-btrfs-error/
-  else
-    echo "$rm_output"
-    exit $rm_exit_code
-  fi
-fi
-
-exit $run_exit_code
-
-################################################################################
-#
-# This image is not intended to be run manually.
-#
-# To create a dockcross helper script for the
-# dockcross/android-x86_64:latest image, run:
-#
-# docker run --rm dockcross/android-x86_64:latest > dockcross-android-x86_64-latest
-# chmod +x dockcross-android-x86_64-latest
-#
-# You may then wish to move the dockcross script to your PATH.
-#
-################################################################################
diff --git a/docker/dockcross-android-x86 b/docker/dockcross-android-x86
deleted file mode 100755
index e96276a..0000000
--- a/docker/dockcross-android-x86
+++ /dev/null
@@ -1,278 +0,0 @@
-#!/usr/bin/env bash
-
-DEFAULT_DOCKCROSS_IMAGE=dockcross/android-x86:latest
-
-#------------------------------------------------------------------------------
-# Helpers
-#
-err() {
-    echo -e >&2 "ERROR: $*\n"
-}
-
-die() {
-    err "$*"
-    exit 1
-}
-
-has() {
-    # eg. has command update
-    local kind=$1
-    local name=$2
-
-    type -t $kind:$name | grep -q function
-}
-
-# If OCI_EXE is not already set, search for a container executor (OCI stands for "Open Container Initiative")
-if [ -z "$OCI_EXE" ]; then
-    if which docker >/dev/null 2>/dev/null; then
-        OCI_EXE=docker
-    elif which podman >/dev/null 2>/dev/null; then
-        OCI_EXE=podman
-    else
-        die "Cannot find a container executor. Search for docker and podman."
-    fi
-fi
-
-#------------------------------------------------------------------------------
-# Command handlers
-#
-command:update-image() {
-    $OCI_EXE pull $FINAL_IMAGE
-}
-
-help:update-image() {
-    echo "Pull the latest $FINAL_IMAGE ."
-}
-
-command:update-script() {
-    if cmp -s <( $OCI_EXE run --rm $FINAL_IMAGE ) $0; then
-        echo "$0 is up to date"
-    else
-        echo -n "Updating $0 ... "
-        $OCI_EXE run --rm $FINAL_IMAGE > $0 && echo ok
-    fi
-}
-
-help:update-image() {
-    echo "Update $0 from $FINAL_IMAGE ."
-}
-
-command:update() {
-    command:update-image
-    command:update-script
-}
-
-help:update() {
-    echo "Pull the latest $FINAL_IMAGE, and then update $0 from that."
-}
-
-command:help() {
-    if [[ $# != 0 ]]; then
-        if ! has command $1; then
-            err \"$1\" is not an dockcross command
-            command:help
-        elif ! has help $1; then
-            err No help found for \"$1\"
-        else
-            help:$1
-        fi
-    else
-        cat >&2 <<ENDHELP
-Usage: dockcross [options] [--] command [args]
-
-By default, run the given *command* in an dockcross Docker container.
-
-The *options* can be one of:
-
-    --args|-a           Extra args to the *docker run* command
-    --image|-i          Docker cross-compiler image to use
-    --config|-c         Bash script to source before running this script
-
-
-Additionally, there are special update commands:
-
-    update-image
-    update-script
-    update
-
-For update command help use: $0 help <command>
-ENDHELP
-        exit 1
-    fi
-}
-
-#------------------------------------------------------------------------------
-# Option processing
-#
-special_update_command=''
-while [[ $# != 0 ]]; do
-    case $1 in
-
-        --)
-            shift
-            break
-            ;;
-
-        --args|-a)
-            ARG_ARGS="$2"
-            shift 2
-            ;;
-
-        --config|-c)
-            ARG_CONFIG="$2"
-            shift 2
-            ;;
-
-        --image|-i)
-            ARG_IMAGE="$2"
-            shift 2
-            ;;
-        update|update-image|update-script)
-            special_update_command=$1
-            break
-            ;;
-        -*)
-            err Unknown option \"$1\"
-            command:help
-            exit
-            ;;
-
-        *)
-            break
-            ;;
-
-    esac
-done
-
-# The precedence for options is:
-# 1. command-line arguments
-# 2. environment variables
-# 3. defaults
-
-# Source the config file if it exists
-DEFAULT_DOCKCROSS_CONFIG=~/.dockcross
-FINAL_CONFIG=${ARG_CONFIG-${DOCKCROSS_CONFIG-$DEFAULT_DOCKCROSS_CONFIG}}
-
-[[ -f "$FINAL_CONFIG" ]] && source "$FINAL_CONFIG"
-
-# Set the docker image
-FINAL_IMAGE=${ARG_IMAGE-${DOCKCROSS_IMAGE-$DEFAULT_DOCKCROSS_IMAGE}}
-
-# Handle special update command
-if [ "$special_update_command" != "" ]; then
-    case $special_update_command in
-
-        update)
-            command:update
-            exit $?
-            ;;
-
-        update-image)
-            command:update-image
-            exit $?
-            ;;
-
-        update-script)
-            command:update-script
-            exit $?
-            ;;
-
-    esac
-fi
-
-# Set the docker run extra args (if any)
-FINAL_ARGS=${ARG_ARGS-${DOCKCROSS_ARGS}}
-
-# Bash on Ubuntu on Windows
-UBUNTU_ON_WINDOWS=$([ -e /proc/version ] && grep -l Microsoft /proc/version || echo "")
-# MSYS, Git Bash, etc.
-MSYS=$([ -e /proc/version ] && grep -l MINGW /proc/version || echo "")
-# CYGWIN
-CYGWIN=$([ -e /proc/version ] && grep -l CYGWIN /proc/version || echo "")
-
-if [ -z "$UBUNTU_ON_WINDOWS" -a -z "$MSYS" ]; then
-    USER_IDS=(-e BUILDER_UID="$( id -u )" -e BUILDER_GID="$( id -g )" -e BUILDER_USER="$( id -un )" -e BUILDER_GROUP="$( id -gn )")
-fi
-
-# Change the PWD when working in Docker on Windows
-if [ -n "$UBUNTU_ON_WINDOWS" ]; then
-    WSL_ROOT="/mnt/"
-    CFG_FILE=/etc/wsl.conf
-	if [ -f "$CFG_FILE" ]; then
-		CFG_CONTENT=$(cat $CFG_FILE | sed -r '/[^=]+=[^=]+/!d' | sed -r 's/\s+=\s/=/g')
-		eval "$CFG_CONTENT"
-		if [ -n "$root" ]; then
-			WSL_ROOT=$root
-		fi
-	fi
-    HOST_PWD=`pwd -P`
-    HOST_PWD=${HOST_PWD/$WSL_ROOT//}
-elif [ -n "$MSYS" ]; then
-    HOST_PWD=$PWD
-    HOST_PWD=${HOST_PWD/\//}
-    HOST_PWD=${HOST_PWD/\//:\/}
-elif [ -n "$CYGWIN" ]; then
-    for f in pwd readlink cygpath ; do
-        test -n "$(type "${f}" )" || { echo >&2 "Missing functionality (${f}) (in cygwin)." ; exit 1 ; } ;
-    done ;
-    HOST_PWD="$( cygpath -w "$( readlink -f "$( pwd ;)" ; )" ; )" ;
-else
-    HOST_PWD=$PWD
-    [ -L $HOST_PWD ] && HOST_PWD=$(readlink $HOST_PWD)
-fi
-
-# Mount Additional Volumes
-if [ -z "$SSH_DIR" ]; then
-    SSH_DIR="$HOME/.ssh"
-fi
-
-HOST_VOLUMES=
-if [ -e "$SSH_DIR" -a -z "$MSYS" ]; then
-    if test -n "${CYGWIN}" ; then
-      HOST_VOLUMES+="-v $(cygpath -w ${SSH_DIR} ; ):/home/$(id -un)/.ssh" ;
-    else
-      HOST_VOLUMES+="-v $SSH_DIR:/home/$(id -un)/.ssh" ;
-    fi ;
-fi
-
-#------------------------------------------------------------------------------
-# Now, finally, run the command in a container
-#
-TTY_ARGS=
-tty -s && [ -z "$MSYS" ] && TTY_ARGS=-ti
-CONTAINER_NAME=dockcross_$RANDOM
-$OCI_EXE run $TTY_ARGS --name $CONTAINER_NAME \
-    -v "$HOST_PWD":/work \
-    $HOST_VOLUMES \
-    "${USER_IDS[@]}" \
-    $FINAL_ARGS \
-    $FINAL_IMAGE "$@"
-run_exit_code=$?
-
-# Attempt to delete container
-rm_output=$($OCI_EXE rm -f $CONTAINER_NAME 2>&1)
-rm_exit_code=$?
-if [[ $rm_exit_code != 0 ]]; then
-  if [[ "$CIRCLECI" == "true" ]] && [[ $rm_output == *"Driver btrfs failed to remove"* ]]; then
-    : # Ignore error because of https://circleci.com/docs/docker-btrfs-error/
-  else
-    echo "$rm_output"
-    exit $rm_exit_code
-  fi
-fi
-
-exit $run_exit_code
-
-################################################################################
-#
-# This image is not intended to be run manually.
-#
-# To create a dockcross helper script for the
-# dockcross/android-x86:latest image, run:
-#
-# docker run --rm dockcross/android-x86:latest > dockcross-android-x86-latest
-# chmod +x dockcross-android-x86-latest
-#
-# You may then wish to move the dockcross script to your PATH.
-#
-################################################################################
diff --git a/docker/dockcross-linux-arm b/docker/dockcross-linux-arm
deleted file mode 100755
index 734220d..0000000
--- a/docker/dockcross-linux-arm
+++ /dev/null
@@ -1,278 +0,0 @@
-#!/usr/bin/env bash
-
-DEFAULT_DOCKCROSS_IMAGE=dockcross/linux-armv7a:latest
-
-#------------------------------------------------------------------------------
-# Helpers
-#
-err() {
-    echo -e >&2 "ERROR: $*\n"
-}
-
-die() {
-    err "$*"
-    exit 1
-}
-
-has() {
-    # eg. has command update
-    local kind=$1
-    local name=$2
-
-    type -t $kind:$name | grep -q function
-}
-
-# If OCI_EXE is not already set, search for a container executor (OCI stands for "Open Container Initiative")
-if [ -z "$OCI_EXE" ]; then
-    if which docker >/dev/null 2>/dev/null; then
-        OCI_EXE=docker
-    elif which podman >/dev/null 2>/dev/null; then
-        OCI_EXE=podman
-    else
-        die "Cannot find a container executor. Search for docker and podman."
-    fi
-fi
-
-#------------------------------------------------------------------------------
-# Command handlers
-#
-command:update-image() {
-    $OCI_EXE pull $FINAL_IMAGE
-}
-
-help:update-image() {
-    echo "Pull the latest $FINAL_IMAGE ."
-}
-
-command:update-script() {
-    if cmp -s <( $OCI_EXE run --rm $FINAL_IMAGE ) $0; then
-        echo "$0 is up to date"
-    else
-        echo -n "Updating $0 ... "
-        $OCI_EXE run --rm $FINAL_IMAGE > $0 && echo ok
-    fi
-}
-
-help:update-image() {
-    echo "Update $0 from $FINAL_IMAGE ."
-}
-
-command:update() {
-    command:update-image
-    command:update-script
-}
-
-help:update() {
-    echo "Pull the latest $FINAL_IMAGE, and then update $0 from that."
-}
-
-command:help() {
-    if [[ $# != 0 ]]; then
-        if ! has command $1; then
-            err \"$1\" is not an dockcross command
-            command:help
-        elif ! has help $1; then
-            err No help found for \"$1\"
-        else
-            help:$1
-        fi
-    else
-        cat >&2 <<ENDHELP
-Usage: dockcross [options] [--] command [args]
-
-By default, run the given *command* in an dockcross Docker container.
-
-The *options* can be one of:
-
-    --args|-a           Extra args to the *docker run* command
-    --image|-i          Docker cross-compiler image to use
-    --config|-c         Bash script to source before running this script
-
-
-Additionally, there are special update commands:
-
-    update-image
-    update-script
-    update
-
-For update command help use: $0 help <command>
-ENDHELP
-        exit 1
-    fi
-}
-
-#------------------------------------------------------------------------------
-# Option processing
-#
-special_update_command=''
-while [[ $# != 0 ]]; do
-    case $1 in
-
-        --)
-            shift
-            break
-            ;;
-
-        --args|-a)
-            ARG_ARGS="$2"
-            shift 2
-            ;;
-
-        --config|-c)
-            ARG_CONFIG="$2"
-            shift 2
-            ;;
-
-        --image|-i)
-            ARG_IMAGE="$2"
-            shift 2
-            ;;
-        update|update-image|update-script)
-            special_update_command=$1
-            break
-            ;;
-        -*)
-            err Unknown option \"$1\"
-            command:help
-            exit
-            ;;
-
-        *)
-            break
-            ;;
-
-    esac
-done
-
-# The precedence for options is:
-# 1. command-line arguments
-# 2. environment variables
-# 3. defaults
-
-# Source the config file if it exists
-DEFAULT_DOCKCROSS_CONFIG=~/.dockcross
-FINAL_CONFIG=${ARG_CONFIG-${DOCKCROSS_CONFIG-$DEFAULT_DOCKCROSS_CONFIG}}
-
-[[ -f "$FINAL_CONFIG" ]] && source "$FINAL_CONFIG"
-
-# Set the docker image
-FINAL_IMAGE=${ARG_IMAGE-${DOCKCROSS_IMAGE-$DEFAULT_DOCKCROSS_IMAGE}}
-
-# Handle special update command
-if [ "$special_update_command" != "" ]; then
-    case $special_update_command in
-
-        update)
-            command:update
-            exit $?
-            ;;
-
-        update-image)
-            command:update-image
-            exit $?
-            ;;
-
-        update-script)
-            command:update-script
-            exit $?
-            ;;
-
-    esac
-fi
-
-# Set the docker run extra args (if any)
-FINAL_ARGS=${ARG_ARGS-${DOCKCROSS_ARGS}}
-
-# Bash on Ubuntu on Windows
-UBUNTU_ON_WINDOWS=$([ -e /proc/version ] && grep -l Microsoft /proc/version || echo "")
-# MSYS, Git Bash, etc.
-MSYS=$([ -e /proc/version ] && grep -l MINGW /proc/version || echo "")
-# CYGWIN
-CYGWIN=$([ -e /proc/version ] && grep -l CYGWIN /proc/version || echo "")
-
-if [ -z "$UBUNTU_ON_WINDOWS" -a -z "$MSYS" ]; then
-    USER_IDS=(-e BUILDER_UID="$( id -u )" -e BUILDER_GID="$( id -g )" -e BUILDER_USER="$( id -un )" -e BUILDER_GROUP="$( id -gn )")
-fi
-
-# Change the PWD when working in Docker on Windows
-if [ -n "$UBUNTU_ON_WINDOWS" ]; then
-    WSL_ROOT="/mnt/"
-    CFG_FILE=/etc/wsl.conf
-	if [ -f "$CFG_FILE" ]; then
-		CFG_CONTENT=$(cat $CFG_FILE | sed -r '/[^=]+=[^=]+/!d' | sed -r 's/\s+=\s/=/g')
-		eval "$CFG_CONTENT"
-		if [ -n "$root" ]; then
-			WSL_ROOT=$root
-		fi
-	fi
-    HOST_PWD=`pwd -P`
-    HOST_PWD=${HOST_PWD/$WSL_ROOT//}
-elif [ -n "$MSYS" ]; then
-    HOST_PWD=$PWD
-    HOST_PWD=${HOST_PWD/\//}
-    HOST_PWD=${HOST_PWD/\//:\/}
-elif [ -n "$CYGWIN" ]; then
-    for f in pwd readlink cygpath ; do
-        test -n "$(type "${f}" )" || { echo >&2 "Missing functionality (${f}) (in cygwin)." ; exit 1 ; } ;
-    done ;
-    HOST_PWD="$( cygpath -w "$( readlink -f "$( pwd ;)" ; )" ; )" ;
-else
-    HOST_PWD=$PWD
-    [ -L $HOST_PWD ] && HOST_PWD=$(readlink $HOST_PWD)
-fi
-
-# Mount Additional Volumes
-if [ -z "$SSH_DIR" ]; then
-    SSH_DIR="$HOME/.ssh"
-fi
-
-HOST_VOLUMES=
-if [ -e "$SSH_DIR" -a -z "$MSYS" ]; then
-    if test -n "${CYGWIN}" ; then
-      HOST_VOLUMES+="-v $(cygpath -w ${SSH_DIR} ; ):/home/$(id -un)/.ssh" ;
-    else
-      HOST_VOLUMES+="-v $SSH_DIR:/home/$(id -un)/.ssh" ;
-    fi ;
-fi
-
-#------------------------------------------------------------------------------
-# Now, finally, run the command in a container
-#
-TTY_ARGS=
-tty -s && [ -z "$MSYS" ] && TTY_ARGS=-ti
-CONTAINER_NAME=dockcross_$RANDOM
-$OCI_EXE run $TTY_ARGS --name $CONTAINER_NAME \
-    -v "$HOST_PWD":/work \
-    $HOST_VOLUMES \
-    "${USER_IDS[@]}" \
-    $FINAL_ARGS \
-    $FINAL_IMAGE "$@"
-run_exit_code=$?
-
-# Attempt to delete container
-rm_output=$($OCI_EXE rm -f $CONTAINER_NAME 2>&1)
-rm_exit_code=$?
-if [[ $rm_exit_code != 0 ]]; then
-  if [[ "$CIRCLECI" == "true" ]] && [[ $rm_output == *"Driver btrfs failed to remove"* ]]; then
-    : # Ignore error because of https://circleci.com/docs/docker-btrfs-error/
-  else
-    echo "$rm_output"
-    exit $rm_exit_code
-  fi
-fi
-
-exit $run_exit_code
-
-################################################################################
-#
-# This image is not intended to be run manually.
-#
-# To create a dockcross helper script for the
-# dockcross/linux-armv7a:latest image, run:
-#
-# docker run --rm dockcross/linux-armv7a:latest > dockcross-linux-armv7a-latest
-# chmod +x dockcross-linux-armv7a-latest
-#
-# You may then wish to move the dockcross script to your PATH.
-#
-################################################################################
diff --git a/docker/dockcross-linux-arm64 b/docker/dockcross-linux-arm64
deleted file mode 100755
index c9a7cdc..0000000
--- a/docker/dockcross-linux-arm64
+++ /dev/null
@@ -1,278 +0,0 @@
-#!/usr/bin/env bash
-
-DEFAULT_DOCKCROSS_IMAGE=dockcross/linux-arm64-lts:latest
-
-#------------------------------------------------------------------------------
-# Helpers
-#
-err() {
-    echo -e >&2 "ERROR: $*\n"
-}
-
-die() {
-    err "$*"
-    exit 1
-}
-
-has() {
-    # eg. has command update
-    local kind=$1
-    local name=$2
-
-    type -t $kind:$name | grep -q function
-}
-
-# If OCI_EXE is not already set, search for a container executor (OCI stands for "Open Container Initiative")
-if [ -z "$OCI_EXE" ]; then
-    if which docker >/dev/null 2>/dev/null; then
-        OCI_EXE=docker
-    elif which podman >/dev/null 2>/dev/null; then
-        OCI_EXE=podman
-    else
-        die "Cannot find a container executor. Search for docker and podman."
-    fi
-fi
-
-#------------------------------------------------------------------------------
-# Command handlers
-#
-command:update-image() {
-    $OCI_EXE pull $FINAL_IMAGE
-}
-
-help:update-image() {
-    echo "Pull the latest $FINAL_IMAGE ."
-}
-
-command:update-script() {
-    if cmp -s <( $OCI_EXE run --rm $FINAL_IMAGE ) $0; then
-        echo "$0 is up to date"
-    else
-        echo -n "Updating $0 ... "
-        $OCI_EXE run --rm $FINAL_IMAGE > $0 && echo ok
-    fi
-}
-
-help:update-image() {
-    echo "Update $0 from $FINAL_IMAGE ."
-}
-
-command:update() {
-    command:update-image
-    command:update-script
-}
-
-help:update() {
-    echo "Pull the latest $FINAL_IMAGE, and then update $0 from that."
-}
-
-command:help() {
-    if [[ $# != 0 ]]; then
-        if ! has command $1; then
-            err \"$1\" is not an dockcross command
-            command:help
-        elif ! has help $1; then
-            err No help found for \"$1\"
-        else
-            help:$1
-        fi
-    else
-        cat >&2 <<ENDHELP
-Usage: dockcross [options] [--] command [args]
-
-By default, run the given *command* in an dockcross Docker container.
-
-The *options* can be one of:
-
-    --args|-a           Extra args to the *docker run* command
-    --image|-i          Docker cross-compiler image to use
-    --config|-c         Bash script to source before running this script
-
-
-Additionally, there are special update commands:
-
-    update-image
-    update-script
-    update
-
-For update command help use: $0 help <command>
-ENDHELP
-        exit 1
-    fi
-}
-
-#------------------------------------------------------------------------------
-# Option processing
-#
-special_update_command=''
-while [[ $# != 0 ]]; do
-    case $1 in
-
-        --)
-            shift
-            break
-            ;;
-
-        --args|-a)
-            ARG_ARGS="$2"
-            shift 2
-            ;;
-
-        --config|-c)
-            ARG_CONFIG="$2"
-            shift 2
-            ;;
-
-        --image|-i)
-            ARG_IMAGE="$2"
-            shift 2
-            ;;
-        update|update-image|update-script)
-            special_update_command=$1
-            break
-            ;;
-        -*)
-            err Unknown option \"$1\"
-            command:help
-            exit
-            ;;
-
-        *)
-            break
-            ;;
-
-    esac
-done
-
-# The precedence for options is:
-# 1. command-line arguments
-# 2. environment variables
-# 3. defaults
-
-# Source the config file if it exists
-DEFAULT_DOCKCROSS_CONFIG=~/.dockcross
-FINAL_CONFIG=${ARG_CONFIG-${DOCKCROSS_CONFIG-$DEFAULT_DOCKCROSS_CONFIG}}
-
-[[ -f "$FINAL_CONFIG" ]] && source "$FINAL_CONFIG"
-
-# Set the docker image
-FINAL_IMAGE=${ARG_IMAGE-${DOCKCROSS_IMAGE-$DEFAULT_DOCKCROSS_IMAGE}}
-
-# Handle special update command
-if [ "$special_update_command" != "" ]; then
-    case $special_update_command in
-
-        update)
-            command:update
-            exit $?
-            ;;
-
-        update-image)
-            command:update-image
-            exit $?
-            ;;
-
-        update-script)
-            command:update-script
-            exit $?
-            ;;
-
-    esac
-fi
-
-# Set the docker run extra args (if any)
-FINAL_ARGS=${ARG_ARGS-${DOCKCROSS_ARGS}}
-
-# Bash on Ubuntu on Windows
-UBUNTU_ON_WINDOWS=$([ -e /proc/version ] && grep -l Microsoft /proc/version || echo "")
-# MSYS, Git Bash, etc.
-MSYS=$([ -e /proc/version ] && grep -l MINGW /proc/version || echo "")
-# CYGWIN
-CYGWIN=$([ -e /proc/version ] && grep -l CYGWIN /proc/version || echo "")
-
-if [ -z "$UBUNTU_ON_WINDOWS" -a -z "$MSYS" ]; then
-    USER_IDS=(-e BUILDER_UID="$( id -u )" -e BUILDER_GID="$( id -g )" -e BUILDER_USER="$( id -un )" -e BUILDER_GROUP="$( id -gn )")
-fi
-
-# Change the PWD when working in Docker on Windows
-if [ -n "$UBUNTU_ON_WINDOWS" ]; then
-    WSL_ROOT="/mnt/"
-    CFG_FILE=/etc/wsl.conf
-	if [ -f "$CFG_FILE" ]; then
-		CFG_CONTENT=$(cat $CFG_FILE | sed -r '/[^=]+=[^=]+/!d' | sed -r 's/\s+=\s/=/g')
-		eval "$CFG_CONTENT"
-		if [ -n "$root" ]; then
-			WSL_ROOT=$root
-		fi
-	fi
-    HOST_PWD=`pwd -P`
-    HOST_PWD=${HOST_PWD/$WSL_ROOT//}
-elif [ -n "$MSYS" ]; then
-    HOST_PWD=$PWD
-    HOST_PWD=${HOST_PWD/\//}
-    HOST_PWD=${HOST_PWD/\//:\/}
-elif [ -n "$CYGWIN" ]; then
-    for f in pwd readlink cygpath ; do
-        test -n "$(type "${f}" )" || { echo >&2 "Missing functionality (${f}) (in cygwin)." ; exit 1 ; } ;
-    done ;
-    HOST_PWD="$( cygpath -w "$( readlink -f "$( pwd ;)" ; )" ; )" ;
-else
-    HOST_PWD=$PWD
-    [ -L $HOST_PWD ] && HOST_PWD=$(readlink $HOST_PWD)
-fi
-
-# Mount Additional Volumes
-if [ -z "$SSH_DIR" ]; then
-    SSH_DIR="$HOME/.ssh"
-fi
-
-HOST_VOLUMES=
-if [ -e "$SSH_DIR" -a -z "$MSYS" ]; then
-    if test -n "${CYGWIN}" ; then
-      HOST_VOLUMES+="-v $(cygpath -w ${SSH_DIR} ; ):/home/$(id -un)/.ssh" ;
-    else
-      HOST_VOLUMES+="-v $SSH_DIR:/home/$(id -un)/.ssh" ;
-    fi ;
-fi
-
-#------------------------------------------------------------------------------
-# Now, finally, run the command in a container
-#
-TTY_ARGS=
-tty -s && [ -z "$MSYS" ] && TTY_ARGS=-ti
-CONTAINER_NAME=dockcross_$RANDOM
-$OCI_EXE run $TTY_ARGS --name $CONTAINER_NAME \
-    -v "$HOST_PWD":/work \
-    $HOST_VOLUMES \
-    "${USER_IDS[@]}" \
-    $FINAL_ARGS \
-    $FINAL_IMAGE "$@"
-run_exit_code=$?
-
-# Attempt to delete container
-rm_output=$($OCI_EXE rm -f $CONTAINER_NAME 2>&1)
-rm_exit_code=$?
-if [[ $rm_exit_code != 0 ]]; then
-  if [[ "$CIRCLECI" == "true" ]] && [[ $rm_output == *"Driver btrfs failed to remove"* ]]; then
-    : # Ignore error because of https://circleci.com/docs/docker-btrfs-error/
-  else
-    echo "$rm_output"
-    exit $rm_exit_code
-  fi
-fi
-
-exit $run_exit_code
-
-################################################################################
-#
-# This image is not intended to be run manually.
-#
-# To create a dockcross helper script for the
-# dockcross/linux-arm64-lts:latest image, run:
-#
-# docker run --rm dockcross/linux-arm64-lts:latest > dockcross-linux-arm64-lts-latest
-# chmod +x dockcross-linux-arm64-lts-latest
-#
-# You may then wish to move the dockcross script to your PATH.
-#
-################################################################################
diff --git a/docker/dockcross-linux-mips64 b/docker/dockcross-linux-mips64
deleted file mode 100755
index 1ddd25f..0000000
--- a/docker/dockcross-linux-mips64
+++ /dev/null
@@ -1,278 +0,0 @@
-#!/usr/bin/env bash
-
-DEFAULT_DOCKCROSS_IMAGE=dockcross/linux-mips:latest
-
-#------------------------------------------------------------------------------
-# Helpers
-#
-err() {
-    echo -e >&2 "ERROR: $*\n"
-}
-
-die() {
-    err "$*"
-    exit 1
-}
-
-has() {
-    # eg. has command update
-    local kind=$1
-    local name=$2
-
-    type -t $kind:$name | grep -q function
-}
-
-# If OCI_EXE is not already set, search for a container executor (OCI stands for "Open Container Initiative")
-if [ -z "$OCI_EXE" ]; then
-    if which docker >/dev/null 2>/dev/null; then
-        OCI_EXE=docker
-    elif which podman >/dev/null 2>/dev/null; then
-        OCI_EXE=podman
-    else
-        die "Cannot find a container executor. Search for docker and podman."
-    fi
-fi
-
-#------------------------------------------------------------------------------
-# Command handlers
-#
-command:update-image() {
-    $OCI_EXE pull $FINAL_IMAGE
-}
-
-help:update-image() {
-    echo "Pull the latest $FINAL_IMAGE ."
-}
-
-command:update-script() {
-    if cmp -s <( $OCI_EXE run --rm $FINAL_IMAGE ) $0; then
-        echo "$0 is up to date"
-    else
-        echo -n "Updating $0 ... "
-        $OCI_EXE run --rm $FINAL_IMAGE > $0 && echo ok
-    fi
-}
-
-help:update-image() {
-    echo "Update $0 from $FINAL_IMAGE ."
-}
-
-command:update() {
-    command:update-image
-    command:update-script
-}
-
-help:update() {
-    echo "Pull the latest $FINAL_IMAGE, and then update $0 from that."
-}
-
-command:help() {
-    if [[ $# != 0 ]]; then
-        if ! has command $1; then
-            err \"$1\" is not an dockcross command
-            command:help
-        elif ! has help $1; then
-            err No help found for \"$1\"
-        else
-            help:$1
-        fi
-    else
-        cat >&2 <<ENDHELP
-Usage: dockcross [options] [--] command [args]
-
-By default, run the given *command* in an dockcross Docker container.
-
-The *options* can be one of:
-
-    --args|-a           Extra args to the *docker run* command
-    --image|-i          Docker cross-compiler image to use
-    --config|-c         Bash script to source before running this script
-
-
-Additionally, there are special update commands:
-
-    update-image
-    update-script
-    update
-
-For update command help use: $0 help <command>
-ENDHELP
-        exit 1
-    fi
-}
-
-#------------------------------------------------------------------------------
-# Option processing
-#
-special_update_command=''
-while [[ $# != 0 ]]; do
-    case $1 in
-
-        --)
-            shift
-            break
-            ;;
-
-        --args|-a)
-            ARG_ARGS="$2"
-            shift 2
-            ;;
-
-        --config|-c)
-            ARG_CONFIG="$2"
-            shift 2
-            ;;
-
-        --image|-i)
-            ARG_IMAGE="$2"
-            shift 2
-            ;;
-        update|update-image|update-script)
-            special_update_command=$1
-            break
-            ;;
-        -*)
-            err Unknown option \"$1\"
-            command:help
-            exit
-            ;;
-
-        *)
-            break
-            ;;
-
-    esac
-done
-
-# The precedence for options is:
-# 1. command-line arguments
-# 2. environment variables
-# 3. defaults
-
-# Source the config file if it exists
-DEFAULT_DOCKCROSS_CONFIG=~/.dockcross
-FINAL_CONFIG=${ARG_CONFIG-${DOCKCROSS_CONFIG-$DEFAULT_DOCKCROSS_CONFIG}}
-
-[[ -f "$FINAL_CONFIG" ]] && source "$FINAL_CONFIG"
-
-# Set the docker image
-FINAL_IMAGE=${ARG_IMAGE-${DOCKCROSS_IMAGE-$DEFAULT_DOCKCROSS_IMAGE}}
-
-# Handle special update command
-if [ "$special_update_command" != "" ]; then
-    case $special_update_command in
-
-        update)
-            command:update
-            exit $?
-            ;;
-
-        update-image)
-            command:update-image
-            exit $?
-            ;;
-
-        update-script)
-            command:update-script
-            exit $?
-            ;;
-
-    esac
-fi
-
-# Set the docker run extra args (if any)
-FINAL_ARGS=${ARG_ARGS-${DOCKCROSS_ARGS}}
-
-# Bash on Ubuntu on Windows
-UBUNTU_ON_WINDOWS=$([ -e /proc/version ] && grep -l Microsoft /proc/version || echo "")
-# MSYS, Git Bash, etc.
-MSYS=$([ -e /proc/version ] && grep -l MINGW /proc/version || echo "")
-# CYGWIN
-CYGWIN=$([ -e /proc/version ] && grep -l CYGWIN /proc/version || echo "")
-
-if [ -z "$UBUNTU_ON_WINDOWS" -a -z "$MSYS" ]; then
-    USER_IDS=(-e BUILDER_UID="$( id -u )" -e BUILDER_GID="$( id -g )" -e BUILDER_USER="$( id -un )" -e BUILDER_GROUP="$( id -gn )")
-fi
-
-# Change the PWD when working in Docker on Windows
-if [ -n "$UBUNTU_ON_WINDOWS" ]; then
-    WSL_ROOT="/mnt/"
-    CFG_FILE=/etc/wsl.conf
-	if [ -f "$CFG_FILE" ]; then
-		CFG_CONTENT=$(cat $CFG_FILE | sed -r '/[^=]+=[^=]+/!d' | sed -r 's/\s+=\s/=/g')
-		eval "$CFG_CONTENT"
-		if [ -n "$root" ]; then
-			WSL_ROOT=$root
-		fi
-	fi
-    HOST_PWD=`pwd -P`
-    HOST_PWD=${HOST_PWD/$WSL_ROOT//}
-elif [ -n "$MSYS" ]; then
-    HOST_PWD=$PWD
-    HOST_PWD=${HOST_PWD/\//}
-    HOST_PWD=${HOST_PWD/\//:\/}
-elif [ -n "$CYGWIN" ]; then
-    for f in pwd readlink cygpath ; do
-        test -n "$(type "${f}" )" || { echo >&2 "Missing functionality (${f}) (in cygwin)." ; exit 1 ; } ;
-    done ;
-    HOST_PWD="$( cygpath -w "$( readlink -f "$( pwd ;)" ; )" ; )" ;
-else
-    HOST_PWD=$PWD
-    [ -L $HOST_PWD ] && HOST_PWD=$(readlink $HOST_PWD)
-fi
-
-# Mount Additional Volumes
-if [ -z "$SSH_DIR" ]; then
-    SSH_DIR="$HOME/.ssh"
-fi
-
-HOST_VOLUMES=
-if [ -e "$SSH_DIR" -a -z "$MSYS" ]; then
-    if test -n "${CYGWIN}" ; then
-      HOST_VOLUMES+="-v $(cygpath -w ${SSH_DIR} ; ):/home/$(id -un)/.ssh" ;
-    else
-      HOST_VOLUMES+="-v $SSH_DIR:/home/$(id -un)/.ssh" ;
-    fi ;
-fi
-
-#------------------------------------------------------------------------------
-# Now, finally, run the command in a container
-#
-TTY_ARGS=
-tty -s && [ -z "$MSYS" ] && TTY_ARGS=-ti
-CONTAINER_NAME=dockcross_$RANDOM
-$OCI_EXE run $TTY_ARGS --name $CONTAINER_NAME \
-    -v "$HOST_PWD":/work \
-    $HOST_VOLUMES \
-    "${USER_IDS[@]}" \
-    $FINAL_ARGS \
-    $FINAL_IMAGE "$@"
-run_exit_code=$?
-
-# Attempt to delete container
-rm_output=$($OCI_EXE rm -f $CONTAINER_NAME 2>&1)
-rm_exit_code=$?
-if [[ $rm_exit_code != 0 ]]; then
-  if [[ "$CIRCLECI" == "true" ]] && [[ $rm_output == *"Driver btrfs failed to remove"* ]]; then
-    : # Ignore error because of https://circleci.com/docs/docker-btrfs-error/
-  else
-    echo "$rm_output"
-    exit $rm_exit_code
-  fi
-fi
-
-exit $run_exit_code
-
-################################################################################
-#
-# This image is not intended to be run manually.
-#
-# To create a dockcross helper script for the
-# dockcross/linux-mips:latest image, run:
-#
-# docker run --rm dockcross/linux-mips:latest > dockcross-linux-mips-latest
-# chmod +x dockcross-linux-mips-latest
-#
-# You may then wish to move the dockcross script to your PATH.
-#
-################################################################################
diff --git a/docker/dockcross-linux-musl-arm b/docker/dockcross-linux-musl-arm
deleted file mode 100755
index 2bb97c5..0000000
--- a/docker/dockcross-linux-musl-arm
+++ /dev/null
@@ -1,278 +0,0 @@
-#!/usr/bin/env bash
-
-DEFAULT_DOCKCROSS_IMAGE=dockcross/linux-armv7l-musl:latest
-
-#------------------------------------------------------------------------------
-# Helpers
-#
-err() {
-    echo -e >&2 "ERROR: $*\n"
-}
-
-die() {
-    err "$*"
-    exit 1
-}
-
-has() {
-    # eg. has command update
-    local kind=$1
-    local name=$2
-
-    type -t $kind:$name | grep -q function
-}
-
-# If OCI_EXE is not already set, search for a container executor (OCI stands for "Open Container Initiative")
-if [ -z "$OCI_EXE" ]; then
-    if which docker >/dev/null 2>/dev/null; then
-        OCI_EXE=docker
-    elif which podman >/dev/null 2>/dev/null; then
-        OCI_EXE=podman
-    else
-        die "Cannot find a container executor. Search for docker and podman."
-    fi
-fi
-
-#------------------------------------------------------------------------------
-# Command handlers
-#
-command:update-image() {
-    $OCI_EXE pull $FINAL_IMAGE
-}
-
-help:update-image() {
-    echo "Pull the latest $FINAL_IMAGE ."
-}
-
-command:update-script() {
-    if cmp -s <( $OCI_EXE run --rm $FINAL_IMAGE ) $0; then
-        echo "$0 is up to date"
-    else
-        echo -n "Updating $0 ... "
-        $OCI_EXE run --rm $FINAL_IMAGE > $0 && echo ok
-    fi
-}
-
-help:update-image() {
-    echo "Update $0 from $FINAL_IMAGE ."
-}
-
-command:update() {
-    command:update-image
-    command:update-script
-}
-
-help:update() {
-    echo "Pull the latest $FINAL_IMAGE, and then update $0 from that."
-}
-
-command:help() {
-    if [[ $# != 0 ]]; then
-        if ! has command $1; then
-            err \"$1\" is not an dockcross command
-            command:help
-        elif ! has help $1; then
-            err No help found for \"$1\"
-        else
-            help:$1
-        fi
-    else
-        cat >&2 <<ENDHELP
-Usage: dockcross [options] [--] command [args]
-
-By default, run the given *command* in an dockcross Docker container.
-
-The *options* can be one of:
-
-    --args|-a           Extra args to the *docker run* command
-    --image|-i          Docker cross-compiler image to use
-    --config|-c         Bash script to source before running this script
-
-
-Additionally, there are special update commands:
-
-    update-image
-    update-script
-    update
-
-For update command help use: $0 help <command>
-ENDHELP
-        exit 1
-    fi
-}
-
-#------------------------------------------------------------------------------
-# Option processing
-#
-special_update_command=''
-while [[ $# != 0 ]]; do
-    case $1 in
-
-        --)
-            shift
-            break
-            ;;
-
-        --args|-a)
-            ARG_ARGS="$2"
-            shift 2
-            ;;
-
-        --config|-c)
-            ARG_CONFIG="$2"
-            shift 2
-            ;;
-
-        --image|-i)
-            ARG_IMAGE="$2"
-            shift 2
-            ;;
-        update|update-image|update-script)
-            special_update_command=$1
-            break
-            ;;
-        -*)
-            err Unknown option \"$1\"
-            command:help
-            exit
-            ;;
-
-        *)
-            break
-            ;;
-
-    esac
-done
-
-# The precedence for options is:
-# 1. command-line arguments
-# 2. environment variables
-# 3. defaults
-
-# Source the config file if it exists
-DEFAULT_DOCKCROSS_CONFIG=~/.dockcross
-FINAL_CONFIG=${ARG_CONFIG-${DOCKCROSS_CONFIG-$DEFAULT_DOCKCROSS_CONFIG}}
-
-[[ -f "$FINAL_CONFIG" ]] && source "$FINAL_CONFIG"
-
-# Set the docker image
-FINAL_IMAGE=${ARG_IMAGE-${DOCKCROSS_IMAGE-$DEFAULT_DOCKCROSS_IMAGE}}
-
-# Handle special update command
-if [ "$special_update_command" != "" ]; then
-    case $special_update_command in
-
-        update)
-            command:update
-            exit $?
-            ;;
-
-        update-image)
-            command:update-image
-            exit $?
-            ;;
-
-        update-script)
-            command:update-script
-            exit $?
-            ;;
-
-    esac
-fi
-
-# Set the docker run extra args (if any)
-FINAL_ARGS=${ARG_ARGS-${DOCKCROSS_ARGS}}
-
-# Bash on Ubuntu on Windows
-UBUNTU_ON_WINDOWS=$([ -e /proc/version ] && grep -l Microsoft /proc/version || echo "")
-# MSYS, Git Bash, etc.
-MSYS=$([ -e /proc/version ] && grep -l MINGW /proc/version || echo "")
-# CYGWIN
-CYGWIN=$([ -e /proc/version ] && grep -l CYGWIN /proc/version || echo "")
-
-if [ -z "$UBUNTU_ON_WINDOWS" -a -z "$MSYS" ]; then
-    USER_IDS=(-e BUILDER_UID="$( id -u )" -e BUILDER_GID="$( id -g )" -e BUILDER_USER="$( id -un )" -e BUILDER_GROUP="$( id -gn )")
-fi
-
-# Change the PWD when working in Docker on Windows
-if [ -n "$UBUNTU_ON_WINDOWS" ]; then
-    WSL_ROOT="/mnt/"
-    CFG_FILE=/etc/wsl.conf
-	if [ -f "$CFG_FILE" ]; then
-		CFG_CONTENT=$(cat $CFG_FILE | sed -r '/[^=]+=[^=]+/!d' | sed -r 's/\s+=\s/=/g')
-		eval "$CFG_CONTENT"
-		if [ -n "$root" ]; then
-			WSL_ROOT=$root
-		fi
-	fi
-    HOST_PWD=`pwd -P`
-    HOST_PWD=${HOST_PWD/$WSL_ROOT//}
-elif [ -n "$MSYS" ]; then
-    HOST_PWD=$PWD
-    HOST_PWD=${HOST_PWD/\//}
-    HOST_PWD=${HOST_PWD/\//:\/}
-elif [ -n "$CYGWIN" ]; then
-    for f in pwd readlink cygpath ; do
-        test -n "$(type "${f}" )" || { echo >&2 "Missing functionality (${f}) (in cygwin)." ; exit 1 ; } ;
-    done ;
-    HOST_PWD="$( cygpath -w "$( readlink -f "$( pwd ;)" ; )" ; )" ;
-else
-    HOST_PWD=$PWD
-    [ -L $HOST_PWD ] && HOST_PWD=$(readlink $HOST_PWD)
-fi
-
-# Mount Additional Volumes
-if [ -z "$SSH_DIR" ]; then
-    SSH_DIR="$HOME/.ssh"
-fi
-
-HOST_VOLUMES=
-if [ -e "$SSH_DIR" -a -z "$MSYS" ]; then
-    if test -n "${CYGWIN}" ; then
-      HOST_VOLUMES+="-v $(cygpath -w ${SSH_DIR} ; ):/home/$(id -un)/.ssh" ;
-    else
-      HOST_VOLUMES+="-v $SSH_DIR:/home/$(id -un)/.ssh" ;
-    fi ;
-fi
-
-#------------------------------------------------------------------------------
-# Now, finally, run the command in a container
-#
-TTY_ARGS=
-tty -s && [ -z "$MSYS" ] && TTY_ARGS=-ti
-CONTAINER_NAME=dockcross_$RANDOM
-$OCI_EXE run $TTY_ARGS --name $CONTAINER_NAME \
-    -v "$HOST_PWD":/work \
-    $HOST_VOLUMES \
-    "${USER_IDS[@]}" \
-    $FINAL_ARGS \
-    $FINAL_IMAGE "$@"
-run_exit_code=$?
-
-# Attempt to delete container
-rm_output=$($OCI_EXE rm -f $CONTAINER_NAME 2>&1)
-rm_exit_code=$?
-if [[ $rm_exit_code != 0 ]]; then
-  if [[ "$CIRCLECI" == "true" ]] && [[ $rm_output == *"Driver btrfs failed to remove"* ]]; then
-    : # Ignore error because of https://circleci.com/docs/docker-btrfs-error/
-  else
-    echo "$rm_output"
-    exit $rm_exit_code
-  fi
-fi
-
-exit $run_exit_code
-
-################################################################################
-#
-# This image is not intended to be run manually.
-#
-# To create a dockcross helper script for the
-# dockcross/linux-armv7l-musl:latest image, run:
-#
-# docker run --rm dockcross/linux-armv7l-musl:latest > dockcross-linux-armv7l-musl-latest
-# chmod +x dockcross-linux-armv7l-musl-latest
-#
-# You may then wish to move the dockcross script to your PATH.
-#
-################################################################################
diff --git a/docker/dockcross-linux-musl-arm64 b/docker/dockcross-linux-musl-arm64
deleted file mode 100755
index cb7d709..0000000
--- a/docker/dockcross-linux-musl-arm64
+++ /dev/null
@@ -1,278 +0,0 @@
-#!/usr/bin/env bash
-
-DEFAULT_DOCKCROSS_IMAGE=dockcross/linux-arm64-musl:latest
-
-#------------------------------------------------------------------------------
-# Helpers
-#
-err() {
-    echo -e >&2 "ERROR: $*\n"
-}
-
-die() {
-    err "$*"
-    exit 1
-}
-
-has() {
-    # eg. has command update
-    local kind=$1
-    local name=$2
-
-    type -t $kind:$name | grep -q function
-}
-
-# If OCI_EXE is not already set, search for a container executor (OCI stands for "Open Container Initiative")
-if [ -z "$OCI_EXE" ]; then
-    if which docker >/dev/null 2>/dev/null; then
-        OCI_EXE=docker
-    elif which podman >/dev/null 2>/dev/null; then
-        OCI_EXE=podman
-    else
-        die "Cannot find a container executor. Search for docker and podman."
-    fi
-fi
-
-#------------------------------------------------------------------------------
-# Command handlers
-#
-command:update-image() {
-    $OCI_EXE pull $FINAL_IMAGE
-}
-
-help:update-image() {
-    echo "Pull the latest $FINAL_IMAGE ."
-}
-
-command:update-script() {
-    if cmp -s <( $OCI_EXE run --rm $FINAL_IMAGE ) $0; then
-        echo "$0 is up to date"
-    else
-        echo -n "Updating $0 ... "
-        $OCI_EXE run --rm $FINAL_IMAGE > $0 && echo ok
-    fi
-}
-
-help:update-image() {
-    echo "Update $0 from $FINAL_IMAGE ."
-}
-
-command:update() {
-    command:update-image
-    command:update-script
-}
-
-help:update() {
-    echo "Pull the latest $FINAL_IMAGE, and then update $0 from that."
-}
-
-command:help() {
-    if [[ $# != 0 ]]; then
-        if ! has command $1; then
-            err \"$1\" is not an dockcross command
-            command:help
-        elif ! has help $1; then
-            err No help found for \"$1\"
-        else
-            help:$1
-        fi
-    else
-        cat >&2 <<ENDHELP
-Usage: dockcross [options] [--] command [args]
-
-By default, run the given *command* in an dockcross Docker container.
-
-The *options* can be one of:
-
-    --args|-a           Extra args to the *docker run* command
-    --image|-i          Docker cross-compiler image to use
-    --config|-c         Bash script to source before running this script
-
-
-Additionally, there are special update commands:
-
-    update-image
-    update-script
-    update
-
-For update command help use: $0 help <command>
-ENDHELP
-        exit 1
-    fi
-}
-
-#------------------------------------------------------------------------------
-# Option processing
-#
-special_update_command=''
-while [[ $# != 0 ]]; do
-    case $1 in
-
-        --)
-            shift
-            break
-            ;;
-
-        --args|-a)
-            ARG_ARGS="$2"
-            shift 2
-            ;;
-
-        --config|-c)
-            ARG_CONFIG="$2"
-            shift 2
-            ;;
-
-        --image|-i)
-            ARG_IMAGE="$2"
-            shift 2
-            ;;
-        update|update-image|update-script)
-            special_update_command=$1
-            break
-            ;;
-        -*)
-            err Unknown option \"$1\"
-            command:help
-            exit
-            ;;
-
-        *)
-            break
-            ;;
-
-    esac
-done
-
-# The precedence for options is:
-# 1. command-line arguments
-# 2. environment variables
-# 3. defaults
-
-# Source the config file if it exists
-DEFAULT_DOCKCROSS_CONFIG=~/.dockcross
-FINAL_CONFIG=${ARG_CONFIG-${DOCKCROSS_CONFIG-$DEFAULT_DOCKCROSS_CONFIG}}
-
-[[ -f "$FINAL_CONFIG" ]] && source "$FINAL_CONFIG"
-
-# Set the docker image
-FINAL_IMAGE=${ARG_IMAGE-${DOCKCROSS_IMAGE-$DEFAULT_DOCKCROSS_IMAGE}}
-
-# Handle special update command
-if [ "$special_update_command" != "" ]; then
-    case $special_update_command in
-
-        update)
-            command:update
-            exit $?
-            ;;
-
-        update-image)
-            command:update-image
-            exit $?
-            ;;
-
-        update-script)
-            command:update-script
-            exit $?
-            ;;
-
-    esac
-fi
-
-# Set the docker run extra args (if any)
-FINAL_ARGS=${ARG_ARGS-${DOCKCROSS_ARGS}}
-
-# Bash on Ubuntu on Windows
-UBUNTU_ON_WINDOWS=$([ -e /proc/version ] && grep -l Microsoft /proc/version || echo "")
-# MSYS, Git Bash, etc.
-MSYS=$([ -e /proc/version ] && grep -l MINGW /proc/version || echo "")
-# CYGWIN
-CYGWIN=$([ -e /proc/version ] && grep -l CYGWIN /proc/version || echo "")
-
-if [ -z "$UBUNTU_ON_WINDOWS" -a -z "$MSYS" ]; then
-    USER_IDS=(-e BUILDER_UID="$( id -u )" -e BUILDER_GID="$( id -g )" -e BUILDER_USER="$( id -un )" -e BUILDER_GROUP="$( id -gn )")
-fi
-
-# Change the PWD when working in Docker on Windows
-if [ -n "$UBUNTU_ON_WINDOWS" ]; then
-    WSL_ROOT="/mnt/"
-    CFG_FILE=/etc/wsl.conf
-	if [ -f "$CFG_FILE" ]; then
-		CFG_CONTENT=$(cat $CFG_FILE | sed -r '/[^=]+=[^=]+/!d' | sed -r 's/\s+=\s/=/g')
-		eval "$CFG_CONTENT"
-		if [ -n "$root" ]; then
-			WSL_ROOT=$root
-		fi
-	fi
-    HOST_PWD=`pwd -P`
-    HOST_PWD=${HOST_PWD/$WSL_ROOT//}
-elif [ -n "$MSYS" ]; then
-    HOST_PWD=$PWD
-    HOST_PWD=${HOST_PWD/\//}
-    HOST_PWD=${HOST_PWD/\//:\/}
-elif [ -n "$CYGWIN" ]; then
-    for f in pwd readlink cygpath ; do
-        test -n "$(type "${f}" )" || { echo >&2 "Missing functionality (${f}) (in cygwin)." ; exit 1 ; } ;
-    done ;
-    HOST_PWD="$( cygpath -w "$( readlink -f "$( pwd ;)" ; )" ; )" ;
-else
-    HOST_PWD=$PWD
-    [ -L $HOST_PWD ] && HOST_PWD=$(readlink $HOST_PWD)
-fi
-
-# Mount Additional Volumes
-if [ -z "$SSH_DIR" ]; then
-    SSH_DIR="$HOME/.ssh"
-fi
-
-HOST_VOLUMES=
-if [ -e "$SSH_DIR" -a -z "$MSYS" ]; then
-    if test -n "${CYGWIN}" ; then
-      HOST_VOLUMES+="-v $(cygpath -w ${SSH_DIR} ; ):/home/$(id -un)/.ssh" ;
-    else
-      HOST_VOLUMES+="-v $SSH_DIR:/home/$(id -un)/.ssh" ;
-    fi ;
-fi
-
-#------------------------------------------------------------------------------
-# Now, finally, run the command in a container
-#
-TTY_ARGS=
-tty -s && [ -z "$MSYS" ] && TTY_ARGS=-ti
-CONTAINER_NAME=dockcross_$RANDOM
-$OCI_EXE run $TTY_ARGS --name $CONTAINER_NAME \
-    -v "$HOST_PWD":/work \
-    $HOST_VOLUMES \
-    "${USER_IDS[@]}" \
-    $FINAL_ARGS \
-    $FINAL_IMAGE "$@"
-run_exit_code=$?
-
-# Attempt to delete container
-rm_output=$($OCI_EXE rm -f $CONTAINER_NAME 2>&1)
-rm_exit_code=$?
-if [[ $rm_exit_code != 0 ]]; then
-  if [[ "$CIRCLECI" == "true" ]] && [[ $rm_output == *"Driver btrfs failed to remove"* ]]; then
-    : # Ignore error because of https://circleci.com/docs/docker-btrfs-error/
-  else
-    echo "$rm_output"
-    exit $rm_exit_code
-  fi
-fi
-
-exit $run_exit_code
-
-################################################################################
-#
-# This image is not intended to be run manually.
-#
-# To create a dockcross helper script for the
-# dockcross/linux-arm64-musl:latest image, run:
-#
-# docker run --rm dockcross/linux-arm64-musl:latest > dockcross-linux-arm64-musl-latest
-# chmod +x dockcross-linux-arm64-musl-latest
-#
-# You may then wish to move the dockcross script to your PATH.
-#
-################################################################################
diff --git a/docker/dockcross-linux-s390x b/docker/dockcross-linux-s390x
deleted file mode 100755
index 281ef92..0000000
--- a/docker/dockcross-linux-s390x
+++ /dev/null
@@ -1,278 +0,0 @@
-#!/usr/bin/env bash
-
-DEFAULT_DOCKCROSS_IMAGE=dockcross/linux-s390x:latest
-
-#------------------------------------------------------------------------------
-# Helpers
-#
-err() {
-    echo -e >&2 "ERROR: $*\n"
-}
-
-die() {
-    err "$*"
-    exit 1
-}
-
-has() {
-    # eg. has command update
-    local kind=$1
-    local name=$2
-
-    type -t $kind:$name | grep -q function
-}
-
-# If OCI_EXE is not already set, search for a container executor (OCI stands for "Open Container Initiative")
-if [ -z "$OCI_EXE" ]; then
-    if which docker >/dev/null 2>/dev/null; then
-        OCI_EXE=docker
-    elif which podman >/dev/null 2>/dev/null; then
-        OCI_EXE=podman
-    else
-        die "Cannot find a container executor. Search for docker and podman."
-    fi
-fi
-
-#------------------------------------------------------------------------------
-# Command handlers
-#
-command:update-image() {
-    $OCI_EXE pull $FINAL_IMAGE
-}
-
-help:update-image() {
-    echo "Pull the latest $FINAL_IMAGE ."
-}
-
-command:update-script() {
-    if cmp -s <( $OCI_EXE run --rm $FINAL_IMAGE ) $0; then
-        echo "$0 is up to date"
-    else
-        echo -n "Updating $0 ... "
-        $OCI_EXE run --rm $FINAL_IMAGE > $0 && echo ok
-    fi
-}
-
-help:update-image() {
-    echo "Update $0 from $FINAL_IMAGE ."
-}
-
-command:update() {
-    command:update-image
-    command:update-script
-}
-
-help:update() {
-    echo "Pull the latest $FINAL_IMAGE, and then update $0 from that."
-}
-
-command:help() {
-    if [[ $# != 0 ]]; then
-        if ! has command $1; then
-            err \"$1\" is not an dockcross command
-            command:help
-        elif ! has help $1; then
-            err No help found for \"$1\"
-        else
-            help:$1
-        fi
-    else
-        cat >&2 <<ENDHELP
-Usage: dockcross [options] [--] command [args]
-
-By default, run the given *command* in an dockcross Docker container.
-
-The *options* can be one of:
-
-    --args|-a           Extra args to the *docker run* command
-    --image|-i          Docker cross-compiler image to use
-    --config|-c         Bash script to source before running this script
-
-
-Additionally, there are special update commands:
-
-    update-image
-    update-script
-    update
-
-For update command help use: $0 help <command>
-ENDHELP
-        exit 1
-    fi
-}
-
-#------------------------------------------------------------------------------
-# Option processing
-#
-special_update_command=''
-while [[ $# != 0 ]]; do
-    case $1 in
-
-        --)
-            shift
-            break
-            ;;
-
-        --args|-a)
-            ARG_ARGS="$2"
-            shift 2
-            ;;
-
-        --config|-c)
-            ARG_CONFIG="$2"
-            shift 2
-            ;;
-
-        --image|-i)
-            ARG_IMAGE="$2"
-            shift 2
-            ;;
-        update|update-image|update-script)
-            special_update_command=$1
-            break
-            ;;
-        -*)
-            err Unknown option \"$1\"
-            command:help
-            exit
-            ;;
-
-        *)
-            break
-            ;;
-
-    esac
-done
-
-# The precedence for options is:
-# 1. command-line arguments
-# 2. environment variables
-# 3. defaults
-
-# Source the config file if it exists
-DEFAULT_DOCKCROSS_CONFIG=~/.dockcross
-FINAL_CONFIG=${ARG_CONFIG-${DOCKCROSS_CONFIG-$DEFAULT_DOCKCROSS_CONFIG}}
-
-[[ -f "$FINAL_CONFIG" ]] && source "$FINAL_CONFIG"
-
-# Set the docker image
-FINAL_IMAGE=${ARG_IMAGE-${DOCKCROSS_IMAGE-$DEFAULT_DOCKCROSS_IMAGE}}
-
-# Handle special update command
-if [ "$special_update_command" != "" ]; then
-    case $special_update_command in
-
-        update)
-            command:update
-            exit $?
-            ;;
-
-        update-image)
-            command:update-image
-            exit $?
-            ;;
-
-        update-script)
-            command:update-script
-            exit $?
-            ;;
-
-    esac
-fi
-
-# Set the docker run extra args (if any)
-FINAL_ARGS=${ARG_ARGS-${DOCKCROSS_ARGS}}
-
-# Bash on Ubuntu on Windows
-UBUNTU_ON_WINDOWS=$([ -e /proc/version ] && grep -l Microsoft /proc/version || echo "")
-# MSYS, Git Bash, etc.
-MSYS=$([ -e /proc/version ] && grep -l MINGW /proc/version || echo "")
-# CYGWIN
-CYGWIN=$([ -e /proc/version ] && grep -l CYGWIN /proc/version || echo "")
-
-if [ -z "$UBUNTU_ON_WINDOWS" -a -z "$MSYS" ]; then
-    USER_IDS=(-e BUILDER_UID="$( id -u )" -e BUILDER_GID="$( id -g )" -e BUILDER_USER="$( id -un )" -e BUILDER_GROUP="$( id -gn )")
-fi
-
-# Change the PWD when working in Docker on Windows
-if [ -n "$UBUNTU_ON_WINDOWS" ]; then
-    WSL_ROOT="/mnt/"
-    CFG_FILE=/etc/wsl.conf
-	if [ -f "$CFG_FILE" ]; then
-		CFG_CONTENT=$(cat $CFG_FILE | sed -r '/[^=]+=[^=]+/!d' | sed -r 's/\s+=\s/=/g')
-		eval "$CFG_CONTENT"
-		if [ -n "$root" ]; then
-			WSL_ROOT=$root
-		fi
-	fi
-    HOST_PWD=`pwd -P`
-    HOST_PWD=${HOST_PWD/$WSL_ROOT//}
-elif [ -n "$MSYS" ]; then
-    HOST_PWD=$PWD
-    HOST_PWD=${HOST_PWD/\//}
-    HOST_PWD=${HOST_PWD/\//:\/}
-elif [ -n "$CYGWIN" ]; then
-    for f in pwd readlink cygpath ; do
-        test -n "$(type "${f}" )" || { echo >&2 "Missing functionality (${f}) (in cygwin)." ; exit 1 ; } ;
-    done ;
-    HOST_PWD="$( cygpath -w "$( readlink -f "$( pwd ;)" ; )" ; )" ;
-else
-    HOST_PWD=$PWD
-    [ -L $HOST_PWD ] && HOST_PWD=$(readlink $HOST_PWD)
-fi
-
-# Mount Additional Volumes
-if [ -z "$SSH_DIR" ]; then
-    SSH_DIR="$HOME/.ssh"
-fi
-
-HOST_VOLUMES=
-if [ -e "$SSH_DIR" -a -z "$MSYS" ]; then
-    if test -n "${CYGWIN}" ; then
-      HOST_VOLUMES+="-v $(cygpath -w ${SSH_DIR} ; ):/home/$(id -un)/.ssh" ;
-    else
-      HOST_VOLUMES+="-v $SSH_DIR:/home/$(id -un)/.ssh" ;
-    fi ;
-fi
-
-#------------------------------------------------------------------------------
-# Now, finally, run the command in a container
-#
-TTY_ARGS=
-tty -s && [ -z "$MSYS" ] && TTY_ARGS=-ti
-CONTAINER_NAME=dockcross_$RANDOM
-$OCI_EXE run $TTY_ARGS --name $CONTAINER_NAME \
-    -v "$HOST_PWD":/work \
-    $HOST_VOLUMES \
-    "${USER_IDS[@]}" \
-    $FINAL_ARGS \
-    $FINAL_IMAGE "$@"
-run_exit_code=$?
-
-# Attempt to delete container
-rm_output=$($OCI_EXE rm -f $CONTAINER_NAME 2>&1)
-rm_exit_code=$?
-if [[ $rm_exit_code != 0 ]]; then
-  if [[ "$CIRCLECI" == "true" ]] && [[ $rm_output == *"Driver btrfs failed to remove"* ]]; then
-    : # Ignore error because of https://circleci.com/docs/docker-btrfs-error/
-  else
-    echo "$rm_output"
-    exit $rm_exit_code
-  fi
-fi
-
-exit $run_exit_code
-
-################################################################################
-#
-# This image is not intended to be run manually.
-#
-# To create a dockcross helper script for the
-# dockcross/linux-s390x:latest image, run:
-#
-# docker run --rm dockcross/linux-s390x:latest > dockcross-linux-s390x-latest
-# chmod +x dockcross-linux-s390x-latest
-#
-# You may then wish to move the dockcross script to your PATH.
-#
-################################################################################
diff --git a/docker/dockcross-linux-x64 b/docker/dockcross-linux-x64
deleted file mode 100755
index 8cb6813..0000000
--- a/docker/dockcross-linux-x64
+++ /dev/null
@@ -1,278 +0,0 @@
-#!/usr/bin/env bash
-
-DEFAULT_DOCKCROSS_IMAGE=dockcross/linux-x64:latest
-
-#------------------------------------------------------------------------------
-# Helpers
-#
-err() {
-    echo -e >&2 "ERROR: $*\n"
-}
-
-die() {
-    err "$*"
-    exit 1
-}
-
-has() {
-    # eg. has command update
-    local kind=$1
-    local name=$2
-
-    type -t $kind:$name | grep -q function
-}
-
-# If OCI_EXE is not already set, search for a container executor (OCI stands for "Open Container Initiative")
-if [ -z "$OCI_EXE" ]; then
-    if which docker >/dev/null 2>/dev/null; then
-        OCI_EXE=docker
-    elif which podman >/dev/null 2>/dev/null; then
-        OCI_EXE=podman
-    else
-        die "Cannot find a container executor. Search for docker and podman."
-    fi
-fi
-
-#------------------------------------------------------------------------------
-# Command handlers
-#
-command:update-image() {
-    $OCI_EXE pull $FINAL_IMAGE
-}
-
-help:update-image() {
-    echo "Pull the latest $FINAL_IMAGE ."
-}
-
-command:update-script() {
-    if cmp -s <( $OCI_EXE run --rm $FINAL_IMAGE ) $0; then
-        echo "$0 is up to date"
-    else
-        echo -n "Updating $0 ... "
-        $OCI_EXE run --rm $FINAL_IMAGE > $0 && echo ok
-    fi
-}
-
-help:update-image() {
-    echo "Update $0 from $FINAL_IMAGE ."
-}
-
-command:update() {
-    command:update-image
-    command:update-script
-}
-
-help:update() {
-    echo "Pull the latest $FINAL_IMAGE, and then update $0 from that."
-}
-
-command:help() {
-    if [[ $# != 0 ]]; then
-        if ! has command $1; then
-            err \"$1\" is not an dockcross command
-            command:help
-        elif ! has help $1; then
-            err No help found for \"$1\"
-        else
-            help:$1
-        fi
-    else
-        cat >&2 <<ENDHELP
-Usage: dockcross [options] [--] command [args]
-
-By default, run the given *command* in an dockcross Docker container.
-
-The *options* can be one of:
-
-    --args|-a           Extra args to the *docker run* command
-    --image|-i          Docker cross-compiler image to use
-    --config|-c         Bash script to source before running this script
-
-
-Additionally, there are special update commands:
-
-    update-image
-    update-script
-    update
-
-For update command help use: $0 help <command>
-ENDHELP
-        exit 1
-    fi
-}
-
-#------------------------------------------------------------------------------
-# Option processing
-#
-special_update_command=''
-while [[ $# != 0 ]]; do
-    case $1 in
-
-        --)
-            shift
-            break
-            ;;
-
-        --args|-a)
-            ARG_ARGS="$2"
-            shift 2
-            ;;
-
-        --config|-c)
-            ARG_CONFIG="$2"
-            shift 2
-            ;;
-
-        --image|-i)
-            ARG_IMAGE="$2"
-            shift 2
-            ;;
-        update|update-image|update-script)
-            special_update_command=$1
-            break
-            ;;
-        -*)
-            err Unknown option \"$1\"
-            command:help
-            exit
-            ;;
-
-        *)
-            break
-            ;;
-
-    esac
-done
-
-# The precedence for options is:
-# 1. command-line arguments
-# 2. environment variables
-# 3. defaults
-
-# Source the config file if it exists
-DEFAULT_DOCKCROSS_CONFIG=~/.dockcross
-FINAL_CONFIG=${ARG_CONFIG-${DOCKCROSS_CONFIG-$DEFAULT_DOCKCROSS_CONFIG}}
-
-[[ -f "$FINAL_CONFIG" ]] && source "$FINAL_CONFIG"
-
-# Set the docker image
-FINAL_IMAGE=${ARG_IMAGE-${DOCKCROSS_IMAGE-$DEFAULT_DOCKCROSS_IMAGE}}
-
-# Handle special update command
-if [ "$special_update_command" != "" ]; then
-    case $special_update_command in
-
-        update)
-            command:update
-            exit $?
-            ;;
-
-        update-image)
-            command:update-image
-            exit $?
-            ;;
-
-        update-script)
-            command:update-script
-            exit $?
-            ;;
-
-    esac
-fi
-
-# Set the docker run extra args (if any)
-FINAL_ARGS=${ARG_ARGS-${DOCKCROSS_ARGS}}
-
-# Bash on Ubuntu on Windows
-UBUNTU_ON_WINDOWS=$([ -e /proc/version ] && grep -l Microsoft /proc/version || echo "")
-# MSYS, Git Bash, etc.
-MSYS=$([ -e /proc/version ] && grep -l MINGW /proc/version || echo "")
-# CYGWIN
-CYGWIN=$([ -e /proc/version ] && grep -l CYGWIN /proc/version || echo "")
-
-if [ -z "$UBUNTU_ON_WINDOWS" -a -z "$MSYS" ]; then
-    USER_IDS=(-e BUILDER_UID="$( id -u )" -e BUILDER_GID="$( id -g )" -e BUILDER_USER="$( id -un )" -e BUILDER_GROUP="$( id -gn )")
-fi
-
-# Change the PWD when working in Docker on Windows
-if [ -n "$UBUNTU_ON_WINDOWS" ]; then
-    WSL_ROOT="/mnt/"
-    CFG_FILE=/etc/wsl.conf
-	if [ -f "$CFG_FILE" ]; then
-		CFG_CONTENT=$(cat $CFG_FILE | sed -r '/[^=]+=[^=]+/!d' | sed -r 's/\s+=\s/=/g')
-		eval "$CFG_CONTENT"
-		if [ -n "$root" ]; then
-			WSL_ROOT=$root
-		fi
-	fi
-    HOST_PWD=`pwd -P`
-    HOST_PWD=${HOST_PWD/$WSL_ROOT//}
-elif [ -n "$MSYS" ]; then
-    HOST_PWD=$PWD
-    HOST_PWD=${HOST_PWD/\//}
-    HOST_PWD=${HOST_PWD/\//:\/}
-elif [ -n "$CYGWIN" ]; then
-    for f in pwd readlink cygpath ; do
-        test -n "$(type "${f}" )" || { echo >&2 "Missing functionality (${f}) (in cygwin)." ; exit 1 ; } ;
-    done ;
-    HOST_PWD="$( cygpath -w "$( readlink -f "$( pwd ;)" ; )" ; )" ;
-else
-    HOST_PWD=$PWD
-    [ -L $HOST_PWD ] && HOST_PWD=$(readlink $HOST_PWD)
-fi
-
-# Mount Additional Volumes
-if [ -z "$SSH_DIR" ]; then
-    SSH_DIR="$HOME/.ssh"
-fi
-
-HOST_VOLUMES=
-if [ -e "$SSH_DIR" -a -z "$MSYS" ]; then
-    if test -n "${CYGWIN}" ; then
-      HOST_VOLUMES+="-v $(cygpath -w ${SSH_DIR} ; ):/home/$(id -un)/.ssh" ;
-    else
-      HOST_VOLUMES+="-v $SSH_DIR:/home/$(id -un)/.ssh" ;
-    fi ;
-fi
-
-#------------------------------------------------------------------------------
-# Now, finally, run the command in a container
-#
-TTY_ARGS=
-tty -s && [ -z "$MSYS" ] && TTY_ARGS=-ti
-CONTAINER_NAME=dockcross_$RANDOM
-$OCI_EXE run $TTY_ARGS --name $CONTAINER_NAME \
-    -v "$HOST_PWD":/work \
-    $HOST_VOLUMES \
-    "${USER_IDS[@]}" \
-    $FINAL_ARGS \
-    $FINAL_IMAGE "$@"
-run_exit_code=$?
-
-# Attempt to delete container
-rm_output=$($OCI_EXE rm -f $CONTAINER_NAME 2>&1)
-rm_exit_code=$?
-if [[ $rm_exit_code != 0 ]]; then
-  if [[ "$CIRCLECI" == "true" ]] && [[ $rm_output == *"Driver btrfs failed to remove"* ]]; then
-    : # Ignore error because of https://circleci.com/docs/docker-btrfs-error/
-  else
-    echo "$rm_output"
-    exit $rm_exit_code
-  fi
-fi
-
-exit $run_exit_code
-
-################################################################################
-#
-# This image is not intended to be run manually.
-#
-# To create a dockcross helper script for the
-# dockcross/linux-x64:latest image, run:
-#
-# docker run --rm dockcross/linux-x64:latest > dockcross-linux-x64-latest
-# chmod +x dockcross-linux-x64-latest
-#
-# You may then wish to move the dockcross script to your PATH.
-#
-################################################################################
diff --git a/docker/dockcross-linux-x86 b/docker/dockcross-linux-x86
deleted file mode 100755
index 3e5cdd1..0000000
--- a/docker/dockcross-linux-x86
+++ /dev/null
@@ -1,278 +0,0 @@
-#!/usr/bin/env bash
-
-DEFAULT_DOCKCROSS_IMAGE=dockcross/linux-x86:latest
-
-#------------------------------------------------------------------------------
-# Helpers
-#
-err() {
-    echo -e >&2 "ERROR: $*\n"
-}
-
-die() {
-    err "$*"
-    exit 1
-}
-
-has() {
-    # eg. has command update
-    local kind=$1
-    local name=$2
-
-    type -t $kind:$name | grep -q function
-}
-
-# If OCI_EXE is not already set, search for a container executor (OCI stands for "Open Container Initiative")
-if [ -z "$OCI_EXE" ]; then
-    if which docker >/dev/null 2>/dev/null; then
-        OCI_EXE=docker
-    elif which podman >/dev/null 2>/dev/null; then
-        OCI_EXE=podman
-    else
-        die "Cannot find a container executor. Search for docker and podman."
-    fi
-fi
-
-#------------------------------------------------------------------------------
-# Command handlers
-#
-command:update-image() {
-    $OCI_EXE pull $FINAL_IMAGE
-}
-
-help:update-image() {
-    echo "Pull the latest $FINAL_IMAGE ."
-}
-
-command:update-script() {
-    if cmp -s <( $OCI_EXE run --rm $FINAL_IMAGE ) $0; then
-        echo "$0 is up to date"
-    else
-        echo -n "Updating $0 ... "
-        $OCI_EXE run --rm $FINAL_IMAGE > $0 && echo ok
-    fi
-}
-
-help:update-image() {
-    echo "Update $0 from $FINAL_IMAGE ."
-}
-
-command:update() {
-    command:update-image
-    command:update-script
-}
-
-help:update() {
-    echo "Pull the latest $FINAL_IMAGE, and then update $0 from that."
-}
-
-command:help() {
-    if [[ $# != 0 ]]; then
-        if ! has command $1; then
-            err \"$1\" is not an dockcross command
-            command:help
-        elif ! has help $1; then
-            err No help found for \"$1\"
-        else
-            help:$1
-        fi
-    else
-        cat >&2 <<ENDHELP
-Usage: dockcross [options] [--] command [args]
-
-By default, run the given *command* in an dockcross Docker container.
-
-The *options* can be one of:
-
-    --args|-a           Extra args to the *docker run* command
-    --image|-i          Docker cross-compiler image to use
-    --config|-c         Bash script to source before running this script
-
-
-Additionally, there are special update commands:
-
-    update-image
-    update-script
-    update
-
-For update command help use: $0 help <command>
-ENDHELP
-        exit 1
-    fi
-}
-
-#------------------------------------------------------------------------------
-# Option processing
-#
-special_update_command=''
-while [[ $# != 0 ]]; do
-    case $1 in
-
-        --)
-            shift
-            break
-            ;;
-
-        --args|-a)
-            ARG_ARGS="$2"
-            shift 2
-            ;;
-
-        --config|-c)
-            ARG_CONFIG="$2"
-            shift 2
-            ;;
-
-        --image|-i)
-            ARG_IMAGE="$2"
-            shift 2
-            ;;
-        update|update-image|update-script)
-            special_update_command=$1
-            break
-            ;;
-        -*)
-            err Unknown option \"$1\"
-            command:help
-            exit
-            ;;
-
-        *)
-            break
-            ;;
-
-    esac
-done
-
-# The precedence for options is:
-# 1. command-line arguments
-# 2. environment variables
-# 3. defaults
-
-# Source the config file if it exists
-DEFAULT_DOCKCROSS_CONFIG=~/.dockcross
-FINAL_CONFIG=${ARG_CONFIG-${DOCKCROSS_CONFIG-$DEFAULT_DOCKCROSS_CONFIG}}
-
-[[ -f "$FINAL_CONFIG" ]] && source "$FINAL_CONFIG"
-
-# Set the docker image
-FINAL_IMAGE=${ARG_IMAGE-${DOCKCROSS_IMAGE-$DEFAULT_DOCKCROSS_IMAGE}}
-
-# Handle special update command
-if [ "$special_update_command" != "" ]; then
-    case $special_update_command in
-
-        update)
-            command:update
-            exit $?
-            ;;
-
-        update-image)
-            command:update-image
-            exit $?
-            ;;
-
-        update-script)
-            command:update-script
-            exit $?
-            ;;
-
-    esac
-fi
-
-# Set the docker run extra args (if any)
-FINAL_ARGS=${ARG_ARGS-${DOCKCROSS_ARGS}}
-
-# Bash on Ubuntu on Windows
-UBUNTU_ON_WINDOWS=$([ -e /proc/version ] && grep -l Microsoft /proc/version || echo "")
-# MSYS, Git Bash, etc.
-MSYS=$([ -e /proc/version ] && grep -l MINGW /proc/version || echo "")
-# CYGWIN
-CYGWIN=$([ -e /proc/version ] && grep -l CYGWIN /proc/version || echo "")
-
-if [ -z "$UBUNTU_ON_WINDOWS" -a -z "$MSYS" ]; then
-    USER_IDS=(-e BUILDER_UID="$( id -u )" -e BUILDER_GID="$( id -g )" -e BUILDER_USER="$( id -un )" -e BUILDER_GROUP="$( id -gn )")
-fi
-
-# Change the PWD when working in Docker on Windows
-if [ -n "$UBUNTU_ON_WINDOWS" ]; then
-    WSL_ROOT="/mnt/"
-    CFG_FILE=/etc/wsl.conf
-	if [ -f "$CFG_FILE" ]; then
-		CFG_CONTENT=$(cat $CFG_FILE | sed -r '/[^=]+=[^=]+/!d' | sed -r 's/\s+=\s/=/g')
-		eval "$CFG_CONTENT"
-		if [ -n "$root" ]; then
-			WSL_ROOT=$root
-		fi
-	fi
-    HOST_PWD=`pwd -P`
-    HOST_PWD=${HOST_PWD/$WSL_ROOT//}
-elif [ -n "$MSYS" ]; then
-    HOST_PWD=$PWD
-    HOST_PWD=${HOST_PWD/\//}
-    HOST_PWD=${HOST_PWD/\//:\/}
-elif [ -n "$CYGWIN" ]; then
-    for f in pwd readlink cygpath ; do
-        test -n "$(type "${f}" )" || { echo >&2 "Missing functionality (${f}) (in cygwin)." ; exit 1 ; } ;
-    done ;
-    HOST_PWD="$( cygpath -w "$( readlink -f "$( pwd ;)" ; )" ; )" ;
-else
-    HOST_PWD=$PWD
-    [ -L $HOST_PWD ] && HOST_PWD=$(readlink $HOST_PWD)
-fi
-
-# Mount Additional Volumes
-if [ -z "$SSH_DIR" ]; then
-    SSH_DIR="$HOME/.ssh"
-fi
-
-HOST_VOLUMES=
-if [ -e "$SSH_DIR" -a -z "$MSYS" ]; then
-    if test -n "${CYGWIN}" ; then
-      HOST_VOLUMES+="-v $(cygpath -w ${SSH_DIR} ; ):/home/$(id -un)/.ssh" ;
-    else
-      HOST_VOLUMES+="-v $SSH_DIR:/home/$(id -un)/.ssh" ;
-    fi ;
-fi
-
-#------------------------------------------------------------------------------
-# Now, finally, run the command in a container
-#
-TTY_ARGS=
-tty -s && [ -z "$MSYS" ] && TTY_ARGS=-ti
-CONTAINER_NAME=dockcross_$RANDOM
-$OCI_EXE run $TTY_ARGS --name $CONTAINER_NAME \
-    -v "$HOST_PWD":/work \
-    $HOST_VOLUMES \
-    "${USER_IDS[@]}" \
-    $FINAL_ARGS \
-    $FINAL_IMAGE "$@"
-run_exit_code=$?
-
-# Attempt to delete container
-rm_output=$($OCI_EXE rm -f $CONTAINER_NAME 2>&1)
-rm_exit_code=$?
-if [[ $rm_exit_code != 0 ]]; then
-  if [[ "$CIRCLECI" == "true" ]] && [[ $rm_output == *"Driver btrfs failed to remove"* ]]; then
-    : # Ignore error because of https://circleci.com/docs/docker-btrfs-error/
-  else
-    echo "$rm_output"
-    exit $rm_exit_code
-  fi
-fi
-
-exit $run_exit_code
-
-################################################################################
-#
-# This image is not intended to be run manually.
-#
-# To create a dockcross helper script for the
-# dockcross/linux-x86:latest image, run:
-#
-# docker run --rm dockcross/linux-x86:latest > dockcross-linux-x86-latest
-# chmod +x dockcross-linux-x86-latest
-#
-# You may then wish to move the dockcross script to your PATH.
-#
-################################################################################
diff --git a/docker/dockcross-win-arm b/docker/dockcross-win-arm
deleted file mode 100755
index 9402922..0000000
--- a/docker/dockcross-win-arm
+++ /dev/null
@@ -1,278 +0,0 @@
-#!/usr/bin/env bash
-
-DEFAULT_DOCKCROSS_IMAGE=dockcross/windows-armv7:latest
-
-#------------------------------------------------------------------------------
-# Helpers
-#
-err() {
-    echo -e >&2 "ERROR: $*\n"
-}
-
-die() {
-    err "$*"
-    exit 1
-}
-
-has() {
-    # eg. has command update
-    local kind=$1
-    local name=$2
-
-    type -t $kind:$name | grep -q function
-}
-
-# If OCI_EXE is not already set, search for a container executor (OCI stands for "Open Container Initiative")
-if [ -z "$OCI_EXE" ]; then
-    if which docker >/dev/null 2>/dev/null; then
-        OCI_EXE=docker
-    elif which podman >/dev/null 2>/dev/null; then
-        OCI_EXE=podman
-    else
-        die "Cannot find a container executor. Search for docker and podman."
-    fi
-fi
-
-#------------------------------------------------------------------------------
-# Command handlers
-#
-command:update-image() {
-    $OCI_EXE pull $FINAL_IMAGE
-}
-
-help:update-image() {
-    echo "Pull the latest $FINAL_IMAGE ."
-}
-
-command:update-script() {
-    if cmp -s <( $OCI_EXE run --rm $FINAL_IMAGE ) $0; then
-        echo "$0 is up to date"
-    else
-        echo -n "Updating $0 ... "
-        $OCI_EXE run --rm $FINAL_IMAGE > $0 && echo ok
-    fi
-}
-
-help:update-image() {
-    echo "Update $0 from $FINAL_IMAGE ."
-}
-
-command:update() {
-    command:update-image
-    command:update-script
-}
-
-help:update() {
-    echo "Pull the latest $FINAL_IMAGE, and then update $0 from that."
-}
-
-command:help() {
-    if [[ $# != 0 ]]; then
-        if ! has command $1; then
-            err \"$1\" is not an dockcross command
-            command:help
-        elif ! has help $1; then
-            err No help found for \"$1\"
-        else
-            help:$1
-        fi
-    else
-        cat >&2 <<ENDHELP
-Usage: dockcross [options] [--] command [args]
-
-By default, run the given *command* in an dockcross Docker container.
-
-The *options* can be one of:
-
-    --args|-a           Extra args to the *docker run* command
-    --image|-i          Docker cross-compiler image to use
-    --config|-c         Bash script to source before running this script
-
-
-Additionally, there are special update commands:
-
-    update-image
-    update-script
-    update
-
-For update command help use: $0 help <command>
-ENDHELP
-        exit 1
-    fi
-}
-
-#------------------------------------------------------------------------------
-# Option processing
-#
-special_update_command=''
-while [[ $# != 0 ]]; do
-    case $1 in
-
-        --)
-            shift
-            break
-            ;;
-
-        --args|-a)
-            ARG_ARGS="$2"
-            shift 2
-            ;;
-
-        --config|-c)
-            ARG_CONFIG="$2"
-            shift 2
-            ;;
-
-        --image|-i)
-            ARG_IMAGE="$2"
-            shift 2
-            ;;
-        update|update-image|update-script)
-            special_update_command=$1
-            break
-            ;;
-        -*)
-            err Unknown option \"$1\"
-            command:help
-            exit
-            ;;
-
-        *)
-            break
-            ;;
-
-    esac
-done
-
-# The precedence for options is:
-# 1. command-line arguments
-# 2. environment variables
-# 3. defaults
-
-# Source the config file if it exists
-DEFAULT_DOCKCROSS_CONFIG=~/.dockcross
-FINAL_CONFIG=${ARG_CONFIG-${DOCKCROSS_CONFIG-$DEFAULT_DOCKCROSS_CONFIG}}
-
-[[ -f "$FINAL_CONFIG" ]] && source "$FINAL_CONFIG"
-
-# Set the docker image
-FINAL_IMAGE=${ARG_IMAGE-${DOCKCROSS_IMAGE-$DEFAULT_DOCKCROSS_IMAGE}}
-
-# Handle special update command
-if [ "$special_update_command" != "" ]; then
-    case $special_update_command in
-
-        update)
-            command:update
-            exit $?
-            ;;
-
-        update-image)
-            command:update-image
-            exit $?
-            ;;
-
-        update-script)
-            command:update-script
-            exit $?
-            ;;
-
-    esac
-fi
-
-# Set the docker run extra args (if any)
-FINAL_ARGS=${ARG_ARGS-${DOCKCROSS_ARGS}}
-
-# Bash on Ubuntu on Windows
-UBUNTU_ON_WINDOWS=$([ -e /proc/version ] && grep -l Microsoft /proc/version || echo "")
-# MSYS, Git Bash, etc.
-MSYS=$([ -e /proc/version ] && grep -l MINGW /proc/version || echo "")
-# CYGWIN
-CYGWIN=$([ -e /proc/version ] && grep -l CYGWIN /proc/version || echo "")
-
-if [ -z "$UBUNTU_ON_WINDOWS" -a -z "$MSYS" ]; then
-    USER_IDS=(-e BUILDER_UID="$( id -u )" -e BUILDER_GID="$( id -g )" -e BUILDER_USER="$( id -un )" -e BUILDER_GROUP="$( id -gn )")
-fi
-
-# Change the PWD when working in Docker on Windows
-if [ -n "$UBUNTU_ON_WINDOWS" ]; then
-    WSL_ROOT="/mnt/"
-    CFG_FILE=/etc/wsl.conf
-	if [ -f "$CFG_FILE" ]; then
-		CFG_CONTENT=$(cat $CFG_FILE | sed -r '/[^=]+=[^=]+/!d' | sed -r 's/\s+=\s/=/g')
-		eval "$CFG_CONTENT"
-		if [ -n "$root" ]; then
-			WSL_ROOT=$root
-		fi
-	fi
-    HOST_PWD=`pwd -P`
-    HOST_PWD=${HOST_PWD/$WSL_ROOT//}
-elif [ -n "$MSYS" ]; then
-    HOST_PWD=$PWD
-    HOST_PWD=${HOST_PWD/\//}
-    HOST_PWD=${HOST_PWD/\//:\/}
-elif [ -n "$CYGWIN" ]; then
-    for f in pwd readlink cygpath ; do
-        test -n "$(type "${f}" )" || { echo >&2 "Missing functionality (${f}) (in cygwin)." ; exit 1 ; } ;
-    done ;
-    HOST_PWD="$( cygpath -w "$( readlink -f "$( pwd ;)" ; )" ; )" ;
-else
-    HOST_PWD=$PWD
-    [ -L $HOST_PWD ] && HOST_PWD=$(readlink $HOST_PWD)
-fi
-
-# Mount Additional Volumes
-if [ -z "$SSH_DIR" ]; then
-    SSH_DIR="$HOME/.ssh"
-fi
-
-HOST_VOLUMES=
-if [ -e "$SSH_DIR" -a -z "$MSYS" ]; then
-    if test -n "${CYGWIN}" ; then
-      HOST_VOLUMES+="-v $(cygpath -w ${SSH_DIR} ; ):/home/$(id -un)/.ssh" ;
-    else
-      HOST_VOLUMES+="-v $SSH_DIR:/home/$(id -un)/.ssh" ;
-    fi ;
-fi
-
-#------------------------------------------------------------------------------
-# Now, finally, run the command in a container
-#
-TTY_ARGS=
-tty -s && [ -z "$MSYS" ] && TTY_ARGS=-ti
-CONTAINER_NAME=dockcross_$RANDOM
-$OCI_EXE run $TTY_ARGS --name $CONTAINER_NAME \
-    -v "$HOST_PWD":/work \
-    $HOST_VOLUMES \
-    "${USER_IDS[@]}" \
-    $FINAL_ARGS \
-    $FINAL_IMAGE "$@"
-run_exit_code=$?
-
-# Attempt to delete container
-rm_output=$($OCI_EXE rm -f $CONTAINER_NAME 2>&1)
-rm_exit_code=$?
-if [[ $rm_exit_code != 0 ]]; then
-  if [[ "$CIRCLECI" == "true" ]] && [[ $rm_output == *"Driver btrfs failed to remove"* ]]; then
-    : # Ignore error because of https://circleci.com/docs/docker-btrfs-error/
-  else
-    echo "$rm_output"
-    exit $rm_exit_code
-  fi
-fi
-
-exit $run_exit_code
-
-################################################################################
-#
-# This image is not intended to be run manually.
-#
-# To create a dockcross helper script for the
-# dockcross/windows-armv7:latest image, run:
-#
-# docker run --rm dockcross/windows-armv7:latest > dockcross-windows-armv7-latest
-# chmod +x dockcross-windows-armv7-latest
-#
-# You may then wish to move the dockcross script to your PATH.
-#
-################################################################################
diff --git a/docker/dockcross-win-arm64 b/docker/dockcross-win-arm64
deleted file mode 100755
index 838deaa..0000000
--- a/docker/dockcross-win-arm64
+++ /dev/null
@@ -1,278 +0,0 @@
-#!/usr/bin/env bash
-
-DEFAULT_DOCKCROSS_IMAGE=dockcross/windows-arm64:latest
-
-#------------------------------------------------------------------------------
-# Helpers
-#
-err() {
-    echo -e >&2 "ERROR: $*\n"
-}
-
-die() {
-    err "$*"
-    exit 1
-}
-
-has() {
-    # eg. has command update
-    local kind=$1
-    local name=$2
-
-    type -t $kind:$name | grep -q function
-}
-
-# If OCI_EXE is not already set, search for a container executor (OCI stands for "Open Container Initiative")
-if [ -z "$OCI_EXE" ]; then
-    if which docker >/dev/null 2>/dev/null; then
-        OCI_EXE=docker
-    elif which podman >/dev/null 2>/dev/null; then
-        OCI_EXE=podman
-    else
-        die "Cannot find a container executor. Search for docker and podman."
-    fi
-fi
-
-#------------------------------------------------------------------------------
-# Command handlers
-#
-command:update-image() {
-    $OCI_EXE pull $FINAL_IMAGE
-}
-
-help:update-image() {
-    echo "Pull the latest $FINAL_IMAGE ."
-}
-
-command:update-script() {
-    if cmp -s <( $OCI_EXE run --rm $FINAL_IMAGE ) $0; then
-        echo "$0 is up to date"
-    else
-        echo -n "Updating $0 ... "
-        $OCI_EXE run --rm $FINAL_IMAGE > $0 && echo ok
-    fi
-}
-
-help:update-image() {
-    echo "Update $0 from $FINAL_IMAGE ."
-}
-
-command:update() {
-    command:update-image
-    command:update-script
-}
-
-help:update() {
-    echo "Pull the latest $FINAL_IMAGE, and then update $0 from that."
-}
-
-command:help() {
-    if [[ $# != 0 ]]; then
-        if ! has command $1; then
-            err \"$1\" is not an dockcross command
-            command:help
-        elif ! has help $1; then
-            err No help found for \"$1\"
-        else
-            help:$1
-        fi
-    else
-        cat >&2 <<ENDHELP
-Usage: dockcross [options] [--] command [args]
-
-By default, run the given *command* in an dockcross Docker container.
-
-The *options* can be one of:
-
-    --args|-a           Extra args to the *docker run* command
-    --image|-i          Docker cross-compiler image to use
-    --config|-c         Bash script to source before running this script
-
-
-Additionally, there are special update commands:
-
-    update-image
-    update-script
-    update
-
-For update command help use: $0 help <command>
-ENDHELP
-        exit 1
-    fi
-}
-
-#------------------------------------------------------------------------------
-# Option processing
-#
-special_update_command=''
-while [[ $# != 0 ]]; do
-    case $1 in
-
-        --)
-            shift
-            break
-            ;;
-
-        --args|-a)
-            ARG_ARGS="$2"
-            shift 2
-            ;;
-
-        --config|-c)
-            ARG_CONFIG="$2"
-            shift 2
-            ;;
-
-        --image|-i)
-            ARG_IMAGE="$2"
-            shift 2
-            ;;
-        update|update-image|update-script)
-            special_update_command=$1
-            break
-            ;;
-        -*)
-            err Unknown option \"$1\"
-            command:help
-            exit
-            ;;
-
-        *)
-            break
-            ;;
-
-    esac
-done
-
-# The precedence for options is:
-# 1. command-line arguments
-# 2. environment variables
-# 3. defaults
-
-# Source the config file if it exists
-DEFAULT_DOCKCROSS_CONFIG=~/.dockcross
-FINAL_CONFIG=${ARG_CONFIG-${DOCKCROSS_CONFIG-$DEFAULT_DOCKCROSS_CONFIG}}
-
-[[ -f "$FINAL_CONFIG" ]] && source "$FINAL_CONFIG"
-
-# Set the docker image
-FINAL_IMAGE=${ARG_IMAGE-${DOCKCROSS_IMAGE-$DEFAULT_DOCKCROSS_IMAGE}}
-
-# Handle special update command
-if [ "$special_update_command" != "" ]; then
-    case $special_update_command in
-
-        update)
-            command:update
-            exit $?
-            ;;
-
-        update-image)
-            command:update-image
-            exit $?
-            ;;
-
-        update-script)
-            command:update-script
-            exit $?
-            ;;
-
-    esac
-fi
-
-# Set the docker run extra args (if any)
-FINAL_ARGS=${ARG_ARGS-${DOCKCROSS_ARGS}}
-
-# Bash on Ubuntu on Windows
-UBUNTU_ON_WINDOWS=$([ -e /proc/version ] && grep -l Microsoft /proc/version || echo "")
-# MSYS, Git Bash, etc.
-MSYS=$([ -e /proc/version ] && grep -l MINGW /proc/version || echo "")
-# CYGWIN
-CYGWIN=$([ -e /proc/version ] && grep -l CYGWIN /proc/version || echo "")
-
-if [ -z "$UBUNTU_ON_WINDOWS" -a -z "$MSYS" ]; then
-    USER_IDS=(-e BUILDER_UID="$( id -u )" -e BUILDER_GID="$( id -g )" -e BUILDER_USER="$( id -un )" -e BUILDER_GROUP="$( id -gn )")
-fi
-
-# Change the PWD when working in Docker on Windows
-if [ -n "$UBUNTU_ON_WINDOWS" ]; then
-    WSL_ROOT="/mnt/"
-    CFG_FILE=/etc/wsl.conf
-	if [ -f "$CFG_FILE" ]; then
-		CFG_CONTENT=$(cat $CFG_FILE | sed -r '/[^=]+=[^=]+/!d' | sed -r 's/\s+=\s/=/g')
-		eval "$CFG_CONTENT"
-		if [ -n "$root" ]; then
-			WSL_ROOT=$root
-		fi
-	fi
-    HOST_PWD=`pwd -P`
-    HOST_PWD=${HOST_PWD/$WSL_ROOT//}
-elif [ -n "$MSYS" ]; then
-    HOST_PWD=$PWD
-    HOST_PWD=${HOST_PWD/\//}
-    HOST_PWD=${HOST_PWD/\//:\/}
-elif [ -n "$CYGWIN" ]; then
-    for f in pwd readlink cygpath ; do
-        test -n "$(type "${f}" )" || { echo >&2 "Missing functionality (${f}) (in cygwin)." ; exit 1 ; } ;
-    done ;
-    HOST_PWD="$( cygpath -w "$( readlink -f "$( pwd ;)" ; )" ; )" ;
-else
-    HOST_PWD=$PWD
-    [ -L $HOST_PWD ] && HOST_PWD=$(readlink $HOST_PWD)
-fi
-
-# Mount Additional Volumes
-if [ -z "$SSH_DIR" ]; then
-    SSH_DIR="$HOME/.ssh"
-fi
-
-HOST_VOLUMES=
-if [ -e "$SSH_DIR" -a -z "$MSYS" ]; then
-    if test -n "${CYGWIN}" ; then
-      HOST_VOLUMES+="-v $(cygpath -w ${SSH_DIR} ; ):/home/$(id -un)/.ssh" ;
-    else
-      HOST_VOLUMES+="-v $SSH_DIR:/home/$(id -un)/.ssh" ;
-    fi ;
-fi
-
-#------------------------------------------------------------------------------
-# Now, finally, run the command in a container
-#
-TTY_ARGS=
-tty -s && [ -z "$MSYS" ] && TTY_ARGS=-ti
-CONTAINER_NAME=dockcross_$RANDOM
-$OCI_EXE run $TTY_ARGS --name $CONTAINER_NAME \
-    -v "$HOST_PWD":/work \
-    $HOST_VOLUMES \
-    "${USER_IDS[@]}" \
-    $FINAL_ARGS \
-    $FINAL_IMAGE "$@"
-run_exit_code=$?
-
-# Attempt to delete container
-rm_output=$($OCI_EXE rm -f $CONTAINER_NAME 2>&1)
-rm_exit_code=$?
-if [[ $rm_exit_code != 0 ]]; then
-  if [[ "$CIRCLECI" == "true" ]] && [[ $rm_output == *"Driver btrfs failed to remove"* ]]; then
-    : # Ignore error because of https://circleci.com/docs/docker-btrfs-error/
-  else
-    echo "$rm_output"
-    exit $rm_exit_code
-  fi
-fi
-
-exit $run_exit_code
-
-################################################################################
-#
-# This image is not intended to be run manually.
-#
-# To create a dockcross helper script for the
-# dockcross/windows-arm64:latest image, run:
-#
-# docker run --rm dockcross/windows-arm64:latest > dockcross-windows-arm64-latest
-# chmod +x dockcross-windows-arm64-latest
-#
-# You may then wish to move the dockcross script to your PATH.
-#
-################################################################################
diff --git a/docker/dockcross-win-x64 b/docker/dockcross-win-x64
deleted file mode 100755
index 27ace74..0000000
--- a/docker/dockcross-win-x64
+++ /dev/null
@@ -1,278 +0,0 @@
-#!/usr/bin/env bash
-
-DEFAULT_DOCKCROSS_IMAGE=dockcross/windows-shared-x64:latest
-
-#------------------------------------------------------------------------------
-# Helpers
-#
-err() {
-    echo -e >&2 "ERROR: $*\n"
-}
-
-die() {
-    err "$*"
-    exit 1
-}
-
-has() {
-    # eg. has command update
-    local kind=$1
-    local name=$2
-
-    type -t $kind:$name | grep -q function
-}
-
-# If OCI_EXE is not already set, search for a container executor (OCI stands for "Open Container Initiative")
-if [ -z "$OCI_EXE" ]; then
-    if which docker >/dev/null 2>/dev/null; then
-        OCI_EXE=docker
-    elif which podman >/dev/null 2>/dev/null; then
-        OCI_EXE=podman
-    else
-        die "Cannot find a container executor. Search for docker and podman."
-    fi
-fi
-
-#------------------------------------------------------------------------------
-# Command handlers
-#
-command:update-image() {
-    $OCI_EXE pull $FINAL_IMAGE
-}
-
-help:update-image() {
-    echo "Pull the latest $FINAL_IMAGE ."
-}
-
-command:update-script() {
-    if cmp -s <( $OCI_EXE run --rm $FINAL_IMAGE ) $0; then
-        echo "$0 is up to date"
-    else
-        echo -n "Updating $0 ... "
-        $OCI_EXE run --rm $FINAL_IMAGE > $0 && echo ok
-    fi
-}
-
-help:update-image() {
-    echo "Update $0 from $FINAL_IMAGE ."
-}
-
-command:update() {
-    command:update-image
-    command:update-script
-}
-
-help:update() {
-    echo "Pull the latest $FINAL_IMAGE, and then update $0 from that."
-}
-
-command:help() {
-    if [[ $# != 0 ]]; then
-        if ! has command $1; then
-            err \"$1\" is not an dockcross command
-            command:help
-        elif ! has help $1; then
-            err No help found for \"$1\"
-        else
-            help:$1
-        fi
-    else
-        cat >&2 <<ENDHELP
-Usage: dockcross [options] [--] command [args]
-
-By default, run the given *command* in an dockcross Docker container.
-
-The *options* can be one of:
-
-    --args|-a           Extra args to the *docker run* command
-    --image|-i          Docker cross-compiler image to use
-    --config|-c         Bash script to source before running this script
-
-
-Additionally, there are special update commands:
-
-    update-image
-    update-script
-    update
-
-For update command help use: $0 help <command>
-ENDHELP
-        exit 1
-    fi
-}
-
-#------------------------------------------------------------------------------
-# Option processing
-#
-special_update_command=''
-while [[ $# != 0 ]]; do
-    case $1 in
-
-        --)
-            shift
-            break
-            ;;
-
-        --args|-a)
-            ARG_ARGS="$2"
-            shift 2
-            ;;
-
-        --config|-c)
-            ARG_CONFIG="$2"
-            shift 2
-            ;;
-
-        --image|-i)
-            ARG_IMAGE="$2"
-            shift 2
-            ;;
-        update|update-image|update-script)
-            special_update_command=$1
-            break
-            ;;
-        -*)
-            err Unknown option \"$1\"
-            command:help
-            exit
-            ;;
-
-        *)
-            break
-            ;;
-
-    esac
-done
-
-# The precedence for options is:
-# 1. command-line arguments
-# 2. environment variables
-# 3. defaults
-
-# Source the config file if it exists
-DEFAULT_DOCKCROSS_CONFIG=~/.dockcross
-FINAL_CONFIG=${ARG_CONFIG-${DOCKCROSS_CONFIG-$DEFAULT_DOCKCROSS_CONFIG}}
-
-[[ -f "$FINAL_CONFIG" ]] && source "$FINAL_CONFIG"
-
-# Set the docker image
-FINAL_IMAGE=${ARG_IMAGE-${DOCKCROSS_IMAGE-$DEFAULT_DOCKCROSS_IMAGE}}
-
-# Handle special update command
-if [ "$special_update_command" != "" ]; then
-    case $special_update_command in
-
-        update)
-            command:update
-            exit $?
-            ;;
-
-        update-image)
-            command:update-image
-            exit $?
-            ;;
-
-        update-script)
-            command:update-script
-            exit $?
-            ;;
-
-    esac
-fi
-
-# Set the docker run extra args (if any)
-FINAL_ARGS=${ARG_ARGS-${DOCKCROSS_ARGS}}
-
-# Bash on Ubuntu on Windows
-UBUNTU_ON_WINDOWS=$([ -e /proc/version ] && grep -l Microsoft /proc/version || echo "")
-# MSYS, Git Bash, etc.
-MSYS=$([ -e /proc/version ] && grep -l MINGW /proc/version || echo "")
-# CYGWIN
-CYGWIN=$([ -e /proc/version ] && grep -l CYGWIN /proc/version || echo "")
-
-if [ -z "$UBUNTU_ON_WINDOWS" -a -z "$MSYS" ]; then
-    USER_IDS=(-e BUILDER_UID="$( id -u )" -e BUILDER_GID="$( id -g )" -e BUILDER_USER="$( id -un )" -e BUILDER_GROUP="$( id -gn )")
-fi
-
-# Change the PWD when working in Docker on Windows
-if [ -n "$UBUNTU_ON_WINDOWS" ]; then
-    WSL_ROOT="/mnt/"
-    CFG_FILE=/etc/wsl.conf
-	if [ -f "$CFG_FILE" ]; then
-		CFG_CONTENT=$(cat $CFG_FILE | sed -r '/[^=]+=[^=]+/!d' | sed -r 's/\s+=\s/=/g')
-		eval "$CFG_CONTENT"
-		if [ -n "$root" ]; then
-			WSL_ROOT=$root
-		fi
-	fi
-    HOST_PWD=`pwd -P`
-    HOST_PWD=${HOST_PWD/$WSL_ROOT//}
-elif [ -n "$MSYS" ]; then
-    HOST_PWD=$PWD
-    HOST_PWD=${HOST_PWD/\//}
-    HOST_PWD=${HOST_PWD/\//:\/}
-elif [ -n "$CYGWIN" ]; then
-    for f in pwd readlink cygpath ; do
-        test -n "$(type "${f}" )" || { echo >&2 "Missing functionality (${f}) (in cygwin)." ; exit 1 ; } ;
-    done ;
-    HOST_PWD="$( cygpath -w "$( readlink -f "$( pwd ;)" ; )" ; )" ;
-else
-    HOST_PWD=$PWD
-    [ -L $HOST_PWD ] && HOST_PWD=$(readlink $HOST_PWD)
-fi
-
-# Mount Additional Volumes
-if [ -z "$SSH_DIR" ]; then
-    SSH_DIR="$HOME/.ssh"
-fi
-
-HOST_VOLUMES=
-if [ -e "$SSH_DIR" -a -z "$MSYS" ]; then
-    if test -n "${CYGWIN}" ; then
-      HOST_VOLUMES+="-v $(cygpath -w ${SSH_DIR} ; ):/home/$(id -un)/.ssh" ;
-    else
-      HOST_VOLUMES+="-v $SSH_DIR:/home/$(id -un)/.ssh" ;
-    fi ;
-fi
-
-#------------------------------------------------------------------------------
-# Now, finally, run the command in a container
-#
-TTY_ARGS=
-tty -s && [ -z "$MSYS" ] && TTY_ARGS=-ti
-CONTAINER_NAME=dockcross_$RANDOM
-$OCI_EXE run $TTY_ARGS --name $CONTAINER_NAME \
-    -v "$HOST_PWD":/work \
-    $HOST_VOLUMES \
-    "${USER_IDS[@]}" \
-    $FINAL_ARGS \
-    $FINAL_IMAGE "$@"
-run_exit_code=$?
-
-# Attempt to delete container
-rm_output=$($OCI_EXE rm -f $CONTAINER_NAME 2>&1)
-rm_exit_code=$?
-if [[ $rm_exit_code != 0 ]]; then
-  if [[ "$CIRCLECI" == "true" ]] && [[ $rm_output == *"Driver btrfs failed to remove"* ]]; then
-    : # Ignore error because of https://circleci.com/docs/docker-btrfs-error/
-  else
-    echo "$rm_output"
-    exit $rm_exit_code
-  fi
-fi
-
-exit $run_exit_code
-
-################################################################################
-#
-# This image is not intended to be run manually.
-#
-# To create a dockcross helper script for the
-# dockcross/windows-shared-x64:latest image, run:
-#
-# docker run --rm dockcross/windows-shared-x64:latest > dockcross-windows-shared-x64-latest
-# chmod +x dockcross-windows-shared-x64-latest
-#
-# You may then wish to move the dockcross script to your PATH.
-#
-################################################################################
diff --git a/docker/dockcross-win-x86 b/docker/dockcross-win-x86
deleted file mode 100755
index 690e563..0000000
--- a/docker/dockcross-win-x86
+++ /dev/null
@@ -1,278 +0,0 @@
-#!/usr/bin/env bash
-
-DEFAULT_DOCKCROSS_IMAGE=dockcross/windows-shared-x86:latest
-
-#------------------------------------------------------------------------------
-# Helpers
-#
-err() {
-    echo -e >&2 "ERROR: $*\n"
-}
-
-die() {
-    err "$*"
-    exit 1
-}
-
-has() {
-    # eg. has command update
-    local kind=$1
-    local name=$2
-
-    type -t $kind:$name | grep -q function
-}
-
-# If OCI_EXE is not already set, search for a container executor (OCI stands for "Open Container Initiative")
-if [ -z "$OCI_EXE" ]; then
-    if which docker >/dev/null 2>/dev/null; then
-        OCI_EXE=docker
-    elif which podman >/dev/null 2>/dev/null; then
-        OCI_EXE=podman
-    else
-        die "Cannot find a container executor. Search for docker and podman."
-    fi
-fi
-
-#------------------------------------------------------------------------------
-# Command handlers
-#
-command:update-image() {
-    $OCI_EXE pull $FINAL_IMAGE
-}
-
-help:update-image() {
-    echo "Pull the latest $FINAL_IMAGE ."
-}
-
-command:update-script() {
-    if cmp -s <( $OCI_EXE run --rm $FINAL_IMAGE ) $0; then
-        echo "$0 is up to date"
-    else
-        echo -n "Updating $0 ... "
-        $OCI_EXE run --rm $FINAL_IMAGE > $0 && echo ok
-    fi
-}
-
-help:update-image() {
-    echo "Update $0 from $FINAL_IMAGE ."
-}
-
-command:update() {
-    command:update-image
-    command:update-script
-}
-
-help:update() {
-    echo "Pull the latest $FINAL_IMAGE, and then update $0 from that."
-}
-
-command:help() {
-    if [[ $# != 0 ]]; then
-        if ! has command $1; then
-            err \"$1\" is not an dockcross command
-            command:help
-        elif ! has help $1; then
-            err No help found for \"$1\"
-        else
-            help:$1
-        fi
-    else
-        cat >&2 <<ENDHELP
-Usage: dockcross [options] [--] command [args]
-
-By default, run the given *command* in an dockcross Docker container.
-
-The *options* can be one of:
-
-    --args|-a           Extra args to the *docker run* command
-    --image|-i          Docker cross-compiler image to use
-    --config|-c         Bash script to source before running this script
-
-
-Additionally, there are special update commands:
-
-    update-image
-    update-script
-    update
-
-For update command help use: $0 help <command>
-ENDHELP
-        exit 1
-    fi
-}
-
-#------------------------------------------------------------------------------
-# Option processing
-#
-special_update_command=''
-while [[ $# != 0 ]]; do
-    case $1 in
-
-        --)
-            shift
-            break
-            ;;
-
-        --args|-a)
-            ARG_ARGS="$2"
-            shift 2
-            ;;
-
-        --config|-c)
-            ARG_CONFIG="$2"
-            shift 2
-            ;;
-
-        --image|-i)
-            ARG_IMAGE="$2"
-            shift 2
-            ;;
-        update|update-image|update-script)
-            special_update_command=$1
-            break
-            ;;
-        -*)
-            err Unknown option \"$1\"
-            command:help
-            exit
-            ;;
-
-        *)
-            break
-            ;;
-
-    esac
-done
-
-# The precedence for options is:
-# 1. command-line arguments
-# 2. environment variables
-# 3. defaults
-
-# Source the config file if it exists
-DEFAULT_DOCKCROSS_CONFIG=~/.dockcross
-FINAL_CONFIG=${ARG_CONFIG-${DOCKCROSS_CONFIG-$DEFAULT_DOCKCROSS_CONFIG}}
-
-[[ -f "$FINAL_CONFIG" ]] && source "$FINAL_CONFIG"
-
-# Set the docker image
-FINAL_IMAGE=${ARG_IMAGE-${DOCKCROSS_IMAGE-$DEFAULT_DOCKCROSS_IMAGE}}
-
-# Handle special update command
-if [ "$special_update_command" != "" ]; then
-    case $special_update_command in
-
-        update)
-            command:update
-            exit $?
-            ;;
-
-        update-image)
-            command:update-image
-            exit $?
-            ;;
-
-        update-script)
-            command:update-script
-            exit $?
-            ;;
-
-    esac
-fi
-
-# Set the docker run extra args (if any)
-FINAL_ARGS=${ARG_ARGS-${DOCKCROSS_ARGS}}
-
-# Bash on Ubuntu on Windows
-UBUNTU_ON_WINDOWS=$([ -e /proc/version ] && grep -l Microsoft /proc/version || echo "")
-# MSYS, Git Bash, etc.
-MSYS=$([ -e /proc/version ] && grep -l MINGW /proc/version || echo "")
-# CYGWIN
-CYGWIN=$([ -e /proc/version ] && grep -l CYGWIN /proc/version || echo "")
-
-if [ -z "$UBUNTU_ON_WINDOWS" -a -z "$MSYS" ]; then
-    USER_IDS=(-e BUILDER_UID="$( id -u )" -e BUILDER_GID="$( id -g )" -e BUILDER_USER="$( id -un )" -e BUILDER_GROUP="$( id -gn )")
-fi
-
-# Change the PWD when working in Docker on Windows
-if [ -n "$UBUNTU_ON_WINDOWS" ]; then
-    WSL_ROOT="/mnt/"
-    CFG_FILE=/etc/wsl.conf
-	if [ -f "$CFG_FILE" ]; then
-		CFG_CONTENT=$(cat $CFG_FILE | sed -r '/[^=]+=[^=]+/!d' | sed -r 's/\s+=\s/=/g')
-		eval "$CFG_CONTENT"
-		if [ -n "$root" ]; then
-			WSL_ROOT=$root
-		fi
-	fi
-    HOST_PWD=`pwd -P`
-    HOST_PWD=${HOST_PWD/$WSL_ROOT//}
-elif [ -n "$MSYS" ]; then
-    HOST_PWD=$PWD
-    HOST_PWD=${HOST_PWD/\//}
-    HOST_PWD=${HOST_PWD/\//:\/}
-elif [ -n "$CYGWIN" ]; then
-    for f in pwd readlink cygpath ; do
-        test -n "$(type "${f}" )" || { echo >&2 "Missing functionality (${f}) (in cygwin)." ; exit 1 ; } ;
-    done ;
-    HOST_PWD="$( cygpath -w "$( readlink -f "$( pwd ;)" ; )" ; )" ;
-else
-    HOST_PWD=$PWD
-    [ -L $HOST_PWD ] && HOST_PWD=$(readlink $HOST_PWD)
-fi
-
-# Mount Additional Volumes
-if [ -z "$SSH_DIR" ]; then
-    SSH_DIR="$HOME/.ssh"
-fi
-
-HOST_VOLUMES=
-if [ -e "$SSH_DIR" -a -z "$MSYS" ]; then
-    if test -n "${CYGWIN}" ; then
-      HOST_VOLUMES+="-v $(cygpath -w ${SSH_DIR} ; ):/home/$(id -un)/.ssh" ;
-    else
-      HOST_VOLUMES+="-v $SSH_DIR:/home/$(id -un)/.ssh" ;
-    fi ;
-fi
-
-#------------------------------------------------------------------------------
-# Now, finally, run the command in a container
-#
-TTY_ARGS=
-tty -s && [ -z "$MSYS" ] && TTY_ARGS=-ti
-CONTAINER_NAME=dockcross_$RANDOM
-$OCI_EXE run $TTY_ARGS --name $CONTAINER_NAME \
-    -v "$HOST_PWD":/work \
-    $HOST_VOLUMES \
-    "${USER_IDS[@]}" \
-    $FINAL_ARGS \
-    $FINAL_IMAGE "$@"
-run_exit_code=$?
-
-# Attempt to delete container
-rm_output=$($OCI_EXE rm -f $CONTAINER_NAME 2>&1)
-rm_exit_code=$?
-if [[ $rm_exit_code != 0 ]]; then
-  if [[ "$CIRCLECI" == "true" ]] && [[ $rm_output == *"Driver btrfs failed to remove"* ]]; then
-    : # Ignore error because of https://circleci.com/docs/docker-btrfs-error/
-  else
-    echo "$rm_output"
-    exit $rm_exit_code
-  fi
-fi
-
-exit $run_exit_code
-
-################################################################################
-#
-# This image is not intended to be run manually.
-#
-# To create a dockcross helper script for the
-# dockcross/windows-shared-x86:latest image, run:
-#
-# docker run --rm dockcross/windows-shared-x86:latest > dockcross-windows-shared-x86-latest
-# chmod +x dockcross-windows-shared-x86-latest
-#
-# You may then wish to move the dockcross script to your PATH.
-#
-################################################################################