Skip to content

Commit

Permalink
Merge pull request #471 from crazy-max/remove-travis
Browse files Browse the repository at this point in the history
Remove travis support and unused buildmode
  • Loading branch information
tonistiigi authored Dec 10, 2020
2 parents 33e3ca5 + 2ca5ffa commit 780fad4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 47 deletions.
31 changes: 0 additions & 31 deletions .travis.yml

This file was deleted.

23 changes: 7 additions & 16 deletions hack/util
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,19 @@
: ${CACHEDIR_FROM=}
: ${CACHEDIR_TO=}

newerEqualThan() { # $1=minimum wanted version $2=actual-version
[ "$1" = "$(printf "$1\n$2" | sort -V | head -n 1)" ]
}
if [ "$PREFER_BUILDCTL" = "1" ]; then
echo >&2 "WARNING: PREFER_BUILDCTL is no longer supported. Ignoring."
fi

if [ "$PREFER_LEGACY" = "1" ]; then
echo >&2 "WARNING: PREFER_LEGACY is no longer supported. Ignoring."
fi

progressFlag=""
if [ "$CI" = "true" ]; then
progressFlag="--progress=plain"
fi

buildmode="legacy"
if [ "$PREFER_BUILDCTL" = "1" ]; then
buildmode="buildkit";
else
serverVersion=$(docker info --format '{{.ServerVersion}}')
experimental=$(docker info --format '{{.ExperimentalBuild}}')
if [ "$PREFER_LEGACY" != "1" ] && ( newerEqualThan "18.09" $serverVersion || \
( newerEqualThan "18.06" $serverVersion && [ "true" = "$experimental" ] ) || \
[ "$DOCKER_BUILDKIT" = "1" ]); then
buildmode="docker-buildkit";
fi
fi

buildxCmd() {
if docker buildx version >/dev/null 2>&1; then
set -x
Expand Down

0 comments on commit 780fad4

Please sign in to comment.