Commit f7b446b5 authored by Alex Bennée's avatar Alex Bennée
Browse files

docker: ignore distro versioning of debootstrap 



We do a minimum version check for the debootstrap but if the distro
has added their own minor version tick it would fail and fall-back to
the SCM version. This is sub-optimal as the latest/greatest version
may be broken at any one particular time. We fix that with a little
sed magic on the version string before passing to our ugly shell
versioning check.

Signed-off-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Tested-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
parent 11cc24a1

tests/docker/dockerfiles/debian-bootstrap.pre

+7 −4
Original line number Diff line number Diff line
@@ -56,11 +56,14 @@ if [ -z $DEBOOTSTRAP_DIR ]; then 
    if [ -z $DEBOOTSTRAP ]; then

        echo "No debootstrap installed, attempting to install from SCM"

        NEED_DEBOOTSTRAP=true

    elif ! (echo "${MIN_DEBOOTSTRAP_VERSION}" ; "${DEBOOTSTRAP}" --version \

            | cut -d ' ' -f 2) | sort -t . -n -k 1,1 -k 2,2 -k 3,3 -c &>/dev/null; then

    else

        INSTALLED_VERSION=$(${DEBOOTSTRAP} --version | sed 's/debootstrap \([0-9\.]*\)[^0-9\.]*.*/\1/')

        if ! (echo "${MIN_DEBOOTSTRAP_VERSION}" ; echo "${INSTALLED_VERSION}") \

                | sort -t . -n -k 1,1 -k 2,2 -k 3,3 -C ; then

            echo "debootstrap too old, attempting to install from SCM"

            NEED_DEBOOTSTRAP=true

        fi

    fi

    if $NEED_DEBOOTSTRAP; then

        DEBOOTSTRAP_SOURCE=https://salsa.debian.org/installer-team/debootstrap.git

        git clone ${DEBOOTSTRAP_SOURCE} ./debootstrap.git