docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18397 from Microsoft/jjh/fix-windows-ci 

Fix broken Windows CI
This commit is contained in:
Jess Frazelle 2015-12-03 12:41:19 -08:00
parent 2f9b541b89 c10311bc9a
commit 94d5459a0c
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hack/make.sh
View File

@ -70,7 +70,11 @@ if command -v git &> /dev/null && git rev-parse &> /dev/null; then
if [ -n "$(git status --porcelain --untracked-files=no)" ]; then if [ -n "$(git status --porcelain --untracked-files=no)" ]; then
GITCOMMIT="$GITCOMMIT-dirty" GITCOMMIT="$GITCOMMIT-dirty"
fi fi
BUILDTIME=$(date --rfc-3339 ns | sed -e 's/ /T/') ! BUILDTIME=$(date --rfc-3339 ns | sed -e 's/ /T/') &> /dev/null
if [ -z $BUILDTIME ]; then
# If using bash 3.1 which doesn't support --rfc-3389, eg Windows CI
BUILDTIME=$(date -u)
fi
elif [ "$DOCKER_GITCOMMIT" ]; then elif [ "$DOCKER_GITCOMMIT" ]; then
GITCOMMIT="$DOCKER_GITCOMMIT" GITCOMMIT="$DOCKER_GITCOMMIT"
else else