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

hack/make.ps1: remove the .0 suffix from go version

We would like to use a version with .0 suffix (like 1.11.0) in
Dockerfile, so that once a .1 version is out (like 1.11.1) we
won't accidentally switch to it.

Unfortunately it's not possible to use .0 suffix currently
as it breaks the check in make.ps1. This patch fixes that.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
Kir Kolyshkin 2018-09-06 11:30:20 -07:00
parent 32a2331103
commit 8ad648b59a

View file

@ -130,7 +130,7 @@ Function Check-InContainer() {
# outside of a container where it may be out of date with master. # outside of a container where it may be out of date with master.
Function Verify-GoVersion() { Function Verify-GoVersion() {
Try { Try {
$goVersionDockerfile=(Select-String -Path ".\Dockerfile" -Pattern "^FROM golang:").ToString().Split(" ")[1].SubString(7) $goVersionDockerfile=(Select-String -Path ".\Dockerfile" -Pattern "^FROM golang:").ToString().Split(" ")[1].SubString(7) -replace '\.0$',''
$goVersionInstalled=(go version).ToString().Split(" ")[2].SubString(2) $goVersionInstalled=(go version).ToString().Split(" ")[2].SubString(2)
} }
Catch [Exception] { Catch [Exception] {