0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #18900 from icecrime/dirty_to_unsupported

Browse source 
Rename `-dirty` to `-unsupported`
This commit is contained in:
Jess Frazelle 2015-12-24 11:06:25 -07:00
commit d1b7d58e73
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
hack/make.sh
View file

@ -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

2
hack/make/build-rpm
View file

@ -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