Signed-off-by: Daniel Nephin <dnephin@docker.com>
| ... | ... |
@@ -114,12 +114,6 @@ Function Get-GitCommit() {
|
| 114 | 114 |
return $gitCommit |
| 115 | 115 |
} |
| 116 | 116 |
|
| 117 |
-# Utility function to get get the current build version of docker |
|
| 118 |
-Function Get-DockerVersion() {
|
|
| 119 |
- if (-not (Test-Path ".\VERSION")) { Throw "VERSION file not found. Is this running from the root of a docker repository?" }
|
|
| 120 |
- return $(Get-Content ".\VERSION" -raw).ToString().Replace("`n","").Trim()
|
|
| 121 |
-} |
|
| 122 |
- |
|
| 123 | 117 |
# Utility function to determine if we are running in a container or not. |
| 124 | 118 |
# In Windows, we get this through an environment variable set in `Dockerfile.Windows` |
| 125 | 119 |
Function Check-InContainer() {
|
| ... | ... |
@@ -356,7 +350,7 @@ Try {
|
| 356 | 356 |
if ($CommitSuffix -ne "") { $gitCommit += "-"+$CommitSuffix -Replace ' ', '' }
|
| 357 | 357 |
|
| 358 | 358 |
# Get the version of docker (eg 17.04.0-dev) |
| 359 |
- $dockerVersion=Get-DockerVersion |
|
| 359 |
+ $dockerVersion="0.0.0-dev" |
|
| 360 | 360 |
|
| 361 | 361 |
# Give a warning if we are not running in a container and are building binaries or running unit tests. |
| 362 | 362 |
# Not relevant for validation tests as these are fine to run outside of a container. |
| ... | ... |
@@ -65,7 +65,7 @@ DEFAULT_BUNDLES=( |
| 65 | 65 |
cross |
| 66 | 66 |
) |
| 67 | 67 |
|
| 68 |
-VERSION=${VERSION:-$(< ./VERSION)}
|
|
| 68 |
+VERSION=${VERSION:-dev}
|
|
| 69 | 69 |
! BUILDTIME=$(date -u -d "@${SOURCE_DATE_EPOCH:-$(date +%s)}" --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/')
|
| 70 | 70 |
if [ "$DOCKER_GITCOMMIT" ]; then |
| 71 | 71 |
GITCOMMIT="$DOCKER_GITCOMMIT" |