From 9a9cb243850de4b2dcc22a6496333e3bf20c42f7 Mon Sep 17 00:00:00 2001 From: Daniel Nephin Date: Wed, 1 Nov 2017 15:46:46 -0400 Subject: [PATCH] Remove version file Signed-off-by: Daniel Nephin Upstream-commit: 1e1ad008db1af4f415b9ef9b8d6d225a09ab42e1 Component: engine --- components/engine/VERSION | 1 - components/engine/hack/make.ps1 | 8 +------- components/engine/hack/make.sh | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) delete mode 100644 components/engine/VERSION diff --git a/components/engine/VERSION b/components/engine/VERSION deleted file mode 100644 index 2d736aaa18..0000000000 --- a/components/engine/VERSION +++ /dev/null @@ -1 +0,0 @@ -17.06.0-dev diff --git a/components/engine/hack/make.ps1 b/components/engine/hack/make.ps1 index 73c9577a0c..3380a5b693 100644 --- a/components/engine/hack/make.ps1 +++ b/components/engine/hack/make.ps1 @@ -114,12 +114,6 @@ Function Get-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. # In Windows, we get this through an environment variable set in `Dockerfile.Windows` Function Check-InContainer() { @@ -356,7 +350,7 @@ Try { if ($CommitSuffix -ne "") { $gitCommit += "-"+$CommitSuffix -Replace ' ', '' } # 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. # Not relevant for validation tests as these are fine to run outside of a container. diff --git a/components/engine/hack/make.sh b/components/engine/hack/make.sh index d6cf3de83f..99c51a7b62 100755 --- a/components/engine/hack/make.sh +++ b/components/engine/hack/make.sh @@ -65,7 +65,7 @@ DEFAULT_BUNDLES=( 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/') if [ "$DOCKER_GITCOMMIT" ]; then GITCOMMIT="$DOCKER_GITCOMMIT"