kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #35368 from dnephin/remove-version-file

Browse source 
Remove version file
This commit is contained in:
Yong Tang 2017-11-03 07:58:37 -07:00 committed by GitHub
commit 47a1786be2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
VERSION
View file

@ -1 +0,0 @@
17.06.0-dev

8
hack/make.ps1
View file

@ -114,12 +114,6 @@ Function Get-GitCommit() {
return $gitCommit return $gitCommit
} }
# Utility function to get get the current build version of docker
Function Get-DockerVersion() {
if (-not (Test-Path ".\VERSION")) { Throw "VERSION file not found. Is this running from the root of a docker repository?" }
return $(Get-Content ".\VERSION" -raw).ToString().Replace("`n","").Trim()
}
# Utility function to determine if we are running in a container or not. # Utility function to determine if we are running in a container or not.
# In Windows, we get this through an environment variable set in `Dockerfile.Windows` # In Windows, we get this through an environment variable set in `Dockerfile.Windows`
Function Check-InContainer() { Function Check-InContainer() {
@ -356,7 +350,7 @@ Try {
if ($CommitSuffix -ne "") { $gitCommit += "-"+$CommitSuffix -Replace ' ', '' } if ($CommitSuffix -ne "") { $gitCommit += "-"+$CommitSuffix -Replace ' ', '' }
# Get the version of docker (eg 17.04.0-dev) # Get the version of docker (eg 17.04.0-dev)
$dockerVersion=Get-DockerVersion $dockerVersion="0.0.0-dev"
# Give a warning if we are not running in a container and are building binaries or running unit tests. # Give a warning if we are not running in a container and are building binaries or running unit tests.
# Not relevant for validation tests as these are fine to run outside of a container. # Not relevant for validation tests as these are fine to run outside of a container.

2
hack/make.sh
View file

@ -65,7 +65,7 @@ DEFAULT_BUNDLES=(
cross cross
) )
VERSION=${VERSION:-$(< ./VERSION)} VERSION=${VERSION:-dev}
! BUILDTIME=$(date -u -d "@${SOURCE_DATE_EPOCH:-$(date +%s)}" --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/') ! BUILDTIME=$(date -u -d "@${SOURCE_DATE_EPOCH:-$(date +%s)}" --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/')
if [ "$DOCKER_GITCOMMIT" ]; then if [ "$DOCKER_GITCOMMIT" ]; then
GITCOMMIT="$DOCKER_GITCOMMIT" GITCOMMIT="$DOCKER_GITCOMMIT"