Merge pull request #302 from thaJeztah/Dockerfile_nits

tianon · web-flow · commit 963918ca305e · 2019-09-07T07:43:49.000-07:00
Windows: improve consistency in install verify steps
diff --git a/1.12/windows/windowsservercore-1803/Dockerfile b/1.12/windows/windowsservercore-1803/Dockerfile
@@ -32,8 +32,8 @@ RUN Write-Host ('Downloading {0} ...' -f $env:GIT_DOWNLOAD_URL); \
 	$env:PATH = 'C:\git\cmd;C:\git\mingw64\bin;C:\git\usr\bin;' + $env:PATH; \
 	[Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine); \
 	\
-	Write-Host 'Verifying install ...'; \
-	Write-Host '  git --version'; git --version; \
+	Write-Host 'Verifying install ("git version") ...'; \
+	git version; \
 	\
 	Write-Host 'Complete.';
 
@@ -62,12 +62,12 @@ RUN $url = ('https://golang.org/dl/go{0}.windows-amd64.zip' -f $env:GOLANG_VERSI
 	Write-Host 'Expanding ...'; \
 	Expand-Archive go.zip -DestinationPath C:\; \
 	\
-	Write-Host 'Verifying install ("go version") ...'; \
-	go version; \
-	\
 	Write-Host 'Removing ...'; \
 	Remove-Item go.zip -Force; \
 	\
+	Write-Host 'Verifying install ("go version") ...'; \
+	go version; \
+	\
 	Write-Host 'Complete.';
 
 WORKDIR $GOPATH
diff --git a/1.12/windows/windowsservercore-1809/Dockerfile b/1.12/windows/windowsservercore-1809/Dockerfile
@@ -32,8 +32,8 @@ RUN Write-Host ('Downloading {0} ...' -f $env:GIT_DOWNLOAD_URL); \
 	$env:PATH = 'C:\git\cmd;C:\git\mingw64\bin;C:\git\usr\bin;' + $env:PATH; \
 	[Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine); \
 	\
-	Write-Host 'Verifying install ...'; \
-	Write-Host '  git --version'; git --version; \
+	Write-Host 'Verifying install ("git version") ...'; \
+	git version; \
 	\
 	Write-Host 'Complete.';
 
@@ -62,12 +62,12 @@ RUN $url = ('https://golang.org/dl/go{0}.windows-amd64.zip' -f $env:GOLANG_VERSI
 	Write-Host 'Expanding ...'; \
 	Expand-Archive go.zip -DestinationPath C:\; \
 	\
-	Write-Host 'Verifying install ("go version") ...'; \
-	go version; \
-	\
 	Write-Host 'Removing ...'; \
 	Remove-Item go.zip -Force; \
 	\
+	Write-Host 'Verifying install ("go version") ...'; \
+	go version; \
+	\
 	Write-Host 'Complete.';
 
 WORKDIR $GOPATH
diff --git a/1.12/windows/windowsservercore-ltsc2016/Dockerfile b/1.12/windows/windowsservercore-ltsc2016/Dockerfile
@@ -32,8 +32,8 @@ RUN Write-Host ('Downloading {0} ...' -f $env:GIT_DOWNLOAD_URL); \
 	$env:PATH = 'C:\git\cmd;C:\git\mingw64\bin;C:\git\usr\bin;' + $env:PATH; \
 	[Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine); \
 	\
-	Write-Host 'Verifying install ...'; \
-	Write-Host '  git --version'; git --version; \
+	Write-Host 'Verifying install ("git version") ...'; \
+	git version; \
 	\
 	Write-Host 'Complete.';
 
@@ -62,12 +62,12 @@ RUN $url = ('https://golang.org/dl/go{0}.windows-amd64.zip' -f $env:GOLANG_VERSI
 	Write-Host 'Expanding ...'; \
 	Expand-Archive go.zip -DestinationPath C:\; \
 	\
-	Write-Host 'Verifying install ("go version") ...'; \
-	go version; \
-	\
 	Write-Host 'Removing ...'; \
 	Remove-Item go.zip -Force; \
 	\
+	Write-Host 'Verifying install ("go version") ...'; \
+	go version; \
+	\
 	Write-Host 'Complete.';
 
 WORKDIR $GOPATH
diff --git a/1.13/windows/windowsservercore-1803/Dockerfile b/1.13/windows/windowsservercore-1803/Dockerfile
@@ -32,8 +32,8 @@ RUN Write-Host ('Downloading {0} ...' -f $env:GIT_DOWNLOAD_URL); \
 	$env:PATH = 'C:\git\cmd;C:\git\mingw64\bin;C:\git\usr\bin;' + $env:PATH; \
 	[Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine); \
 	\
-	Write-Host 'Verifying install ...'; \
-	Write-Host '  git --version'; git --version; \
+	Write-Host 'Verifying install ("git version") ...'; \
+	git version; \
 	\
 	Write-Host 'Complete.';
 
@@ -62,12 +62,12 @@ RUN $url = ('https://golang.org/dl/go{0}.windows-amd64.zip' -f $env:GOLANG_VERSI
 	Write-Host 'Expanding ...'; \
 	Expand-Archive go.zip -DestinationPath C:\; \
 	\
-	Write-Host 'Verifying install ("go version") ...'; \
-	go version; \
-	\
 	Write-Host 'Removing ...'; \
 	Remove-Item go.zip -Force; \
 	\
+	Write-Host 'Verifying install ("go version") ...'; \
+	go version; \
+	\
 	Write-Host 'Complete.';
 
 WORKDIR $GOPATH
diff --git a/1.13/windows/windowsservercore-1809/Dockerfile b/1.13/windows/windowsservercore-1809/Dockerfile
@@ -32,8 +32,8 @@ RUN Write-Host ('Downloading {0} ...' -f $env:GIT_DOWNLOAD_URL); \
 	$env:PATH = 'C:\git\cmd;C:\git\mingw64\bin;C:\git\usr\bin;' + $env:PATH; \
 	[Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine); \
 	\
-	Write-Host 'Verifying install ...'; \
-	Write-Host '  git --version'; git --version; \
+	Write-Host 'Verifying install ("git version") ...'; \
+	git version; \
 	\
 	Write-Host 'Complete.';
 
@@ -62,12 +62,12 @@ RUN $url = ('https://golang.org/dl/go{0}.windows-amd64.zip' -f $env:GOLANG_VERSI
 	Write-Host 'Expanding ...'; \
 	Expand-Archive go.zip -DestinationPath C:\; \
 	\
-	Write-Host 'Verifying install ("go version") ...'; \
-	go version; \
-	\
 	Write-Host 'Removing ...'; \
 	Remove-Item go.zip -Force; \
 	\
+	Write-Host 'Verifying install ("go version") ...'; \
+	go version; \
+	\
 	Write-Host 'Complete.';
 
 WORKDIR $GOPATH
diff --git a/1.13/windows/windowsservercore-ltsc2016/Dockerfile b/1.13/windows/windowsservercore-ltsc2016/Dockerfile
@@ -32,8 +32,8 @@ RUN Write-Host ('Downloading {0} ...' -f $env:GIT_DOWNLOAD_URL); \
 	$env:PATH = 'C:\git\cmd;C:\git\mingw64\bin;C:\git\usr\bin;' + $env:PATH; \
 	[Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine); \
 	\
-	Write-Host 'Verifying install ...'; \
-	Write-Host '  git --version'; git --version; \
+	Write-Host 'Verifying install ("git version") ...'; \
+	git version; \
 	\
 	Write-Host 'Complete.';
 
@@ -62,12 +62,12 @@ RUN $url = ('https://golang.org/dl/go{0}.windows-amd64.zip' -f $env:GOLANG_VERSI
 	Write-Host 'Expanding ...'; \
 	Expand-Archive go.zip -DestinationPath C:\; \
 	\
-	Write-Host 'Verifying install ("go version") ...'; \
-	go version; \
-	\
 	Write-Host 'Removing ...'; \
 	Remove-Item go.zip -Force; \
 	\
+	Write-Host 'Verifying install ("go version") ...'; \
+	go version; \
+	\
 	Write-Host 'Complete.';
 
 WORKDIR $GOPATH
diff --git a/Dockerfile-windows-windowsservercore.template b/Dockerfile-windows-windowsservercore.template
@@ -32,8 +32,8 @@ RUN Write-Host ('Downloading {0} ...' -f $env:GIT_DOWNLOAD_URL); \
 	$env:PATH = 'C:\git\cmd;C:\git\mingw64\bin;C:\git\usr\bin;' + $env:PATH; \
 	[Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine); \
 	\
-	Write-Host 'Verifying install ...'; \
-	Write-Host '  git --version'; git --version; \
+	Write-Host 'Verifying install ("git version") ...'; \
+	git version; \
 	\
 	Write-Host 'Complete.';
 
@@ -62,12 +62,12 @@ RUN $url = ('https://golang.org/dl/go{0}.windows-amd64.zip' -f $env:GOLANG_VERSI
 	Write-Host 'Expanding ...'; \
 	Expand-Archive go.zip -DestinationPath C:\; \
 	\
-	Write-Host 'Verifying install ("go version") ...'; \
-	go version; \
-	\
 	Write-Host 'Removing ...'; \
 	Remove-Item go.zip -Force; \
 	\
+	Write-Host 'Verifying install ("go version") ...'; \
+	go version; \
+	\
 	Write-Host 'Complete.';
 
 WORKDIR $GOPATH

Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,8 @@ RUN Write-Host ('Downloading {0} ...' -f $env:GIT_DOWNLOAD_URL); \`
`32`	`32`	`$env:PATH = 'C:\git\cmd;C:\git\mingw64\bin;C:\git\usr\bin;' + $env:PATH; \`
`33`	`33`	`[Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine); \`
`34`	`34`	`\`
`35`		`- Write-Host 'Verifying install ...'; \`
`36`		`- Write-Host ' git --version'; git --version; \`
	`35`	`+ Write-Host 'Verifying install ("git version") ...'; \`
	`36`	`+ git version; \`
`37`	`37`	`\`
`38`	`38`	`Write-Host 'Complete.';`
`39`	`39`
`@@ -62,12 +62,12 @@ RUN $url = ('https://golang.org/dl/go{0}.windows-amd64.zip' -f $env:GOLANG_VERSI`
`62`	`62`	`Write-Host 'Expanding ...'; \`
`63`	`63`	`Expand-Archive go.zip -DestinationPath C:\; \`
`64`	`64`	`\`
`65`		`- Write-Host 'Verifying install ("go version") ...'; \`
`66`		`- go version; \`
`67`		`- \`
`68`	`65`	`Write-Host 'Removing ...'; \`
`69`	`66`	`Remove-Item go.zip -Force; \`
`70`	`67`	`\`
	`68`	`+ Write-Host 'Verifying install ("go version") ...'; \`
	`69`	`+ go version; \`
	`70`	`+ \`
`71`	`71`	`Write-Host 'Complete.';`
`72`	`72`
`73`	`73`	`WORKDIR $GOPATH`