Merge pull request #21509 from kencochrane/add_better_unsupported_message

Added a better message for when we build an unsupported Docker version
This commit is contained in:
Brian Goff 2016-03-25 13:46:41 -04:00
commit 2c224fb06a

View file

@ -81,6 +81,14 @@ if command -v git &> /dev/null && git rev-parse &> /dev/null; then
GITCOMMIT=$(git rev-parse --short HEAD) GITCOMMIT=$(git rev-parse --short HEAD)
if [ -n "$(git status --porcelain --untracked-files=no)" ]; then if [ -n "$(git status --porcelain --untracked-files=no)" ]; then
GITCOMMIT="$GITCOMMIT-unsupported" GITCOMMIT="$GITCOMMIT-unsupported"
echo "#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
echo "# GITCOMMIT = $GITCOMMIT"
echo "# The version you are building is listed as unsupported because"
echo "# there are some files in the git repository that are in an uncommited state."
echo "# Commit these changes, or add to .gitignore to remove the -unsupported from the version."
echo "# Here is the current list:"
git status --porcelain --untracked-files=no
echo "#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
fi fi
! BUILDTIME=$(date --rfc-3339 ns | sed -e 's/ /T/') &> /dev/null ! BUILDTIME=$(date --rfc-3339 ns | sed -e 's/ /T/') &> /dev/null
if [ -z $BUILDTIME ]; then if [ -z $BUILDTIME ]; then