Skip to content

Commit

Permalink
Merge pull request moby#29082 from runcom/fix-rpm-buildtime
Browse files Browse the repository at this point in the history
hack/make.sh: fix BUILDTIME
  • Loading branch information
vieux authored Dec 6, 2016
2 parents 1c96879 + 7b1f77d commit 29e728e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion hack/make.sh
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ DEFAULT_BUNDLES=(
)

VERSION=$(< ./VERSION)
! BUILDTIME=$(date --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/')
if command -v git &> /dev/null && [ -d .git ] && git rev-parse &> /dev/null; then
GITCOMMIT=$(git rev-parse --short HEAD)
if [ -n "$(git status --porcelain --untracked-files=no)" ]; then
Expand All @@ -82,7 +83,6 @@ if command -v git &> /dev/null && [ -d .git ] && git rev-parse &> /dev/null; the
git status --porcelain --untracked-files=no
echo "#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
fi
! BUILDTIME=$(date --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/') &> /dev/null
elif [ "$DOCKER_GITCOMMIT" ]; then
GITCOMMIT="$DOCKER_GITCOMMIT"
else
Expand Down

0 comments on commit 29e728e

Please sign in to comment.