From 3e298c5928d0a2cbf5e1b374783ce59de2076637 Mon Sep 17 00:00:00 2001 From: Arnaud Porterie Date: Thu, 24 Dec 2015 09:11:49 -0800 Subject: [PATCH] Rename `-dirty` to `-unsupported` Nightly and unofficial builds of Docker bear the suffix `-dirty` in the version string. Change this suffix to `-unsupported` to make it explicit that no support will be provided on such versions, and that it is for example unnecessary to file an issue for it. Signed-off-by: Arnaud Porterie --- hack/make.sh | 4 ++-- hack/make/build-rpm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hack/make.sh b/hack/make.sh index 95f4db090b..c87282b756 100755 --- a/hack/make.sh +++ b/hack/make.sh @@ -11,7 +11,7 @@ set -e # - The VERSION file, at the root of the repository, should exist, and # will be used as Docker binary version and package version. # - The hash of the git commit will also be included in the Docker binary, -# with the suffix -dirty if the repository isn't clean. +# with the suffix -unsupported if the repository isn't clean. # - The script is intended to be run inside the docker container specified # in the Dockerfile at the root of the source. In other words: # DO NOT CALL THIS SCRIPT DIRECTLY. @@ -68,7 +68,7 @@ VERSION=$(< ./VERSION) if command -v git &> /dev/null && git rev-parse &> /dev/null; then GITCOMMIT=$(git rev-parse --short HEAD) if [ -n "$(git status --porcelain --untracked-files=no)" ]; then - GITCOMMIT="$GITCOMMIT-dirty" + GITCOMMIT="$GITCOMMIT-unsupported" fi ! BUILDTIME=$(date --rfc-3339 ns | sed -e 's/ /T/') &> /dev/null if [ -z $BUILDTIME ]; then diff --git a/hack/make/build-rpm b/hack/make/build-rpm index 988dfb46df..43b1b94a0a 100644 --- a/hack/make/build-rpm +++ b/hack/make/build-rpm @@ -26,7 +26,7 @@ set -e DOCKER_GITCOMMIT=$(git rev-parse --short HEAD) if [ -n "$(git status --porcelain --untracked-files=no)" ]; then - DOCKER_GITCOMMIT="$DOCKER_GITCOMMIT-dirty" + DOCKER_GITCOMMIT="$DOCKER_GITCOMMIT-unsupported" fi # if we have a "-dev" suffix or have change in Git, let's make this package version more complex so it works better