Update Docker 17.05.0-ce

StefanScherer · StefanScherer · commit 4886296c5aed · 2017-05-06T09:21:53.000+02:00
diff --git a/mongo/3.4/build.ps1 b/mongo/3.4/build.ps1
@@ -1,4 +1,4 @@
-. $PSScriptRoot\..\..\update-docker-rc.ps1
+. $PSScriptRoot\..\..\update-docker-ce.ps1
 
 Write-Host Building Mongo image for Nanoserver
 docker build -t mongo:nano -f Dockerfile .
diff --git a/mongo/3.4/enterprise/build.ps1 b/mongo/3.4/enterprise/build.ps1
@@ -1,4 +1,4 @@
-. $PSScriptRoot\..\..\..\update-docker-rc.ps1
+. $PSScriptRoot\..\..\..\update-docker-ce.ps1
 
 Write-Host Building Mongo image for Nanoserver
 docker build -t mongo:nano-enterprise -f Dockerfile .
diff --git a/node/build.ps1 b/node/build.ps1
@@ -1,4 +1,4 @@
-. $PSScriptRoot\..\update-docker-rc.ps1
+. $PSScriptRoot\..\update-docker-ce.ps1
 
 function buildVersion($majorMinorPatch, $majorMinor, $major) {
   docker build -t node:$majorMinorPatch $majorMinor
diff --git a/prometheus/build.ps1 b/prometheus/build.ps1
@@ -1,3 +1,3 @@
-. $PSScriptRoot\..\update-docker-rc.ps1
+. $PSScriptRoot\..\update-docker-ce.ps1
 
 docker build -t prometheus .
diff --git a/registry/build.ps1 b/registry/build.ps1
@@ -1,4 +1,4 @@
-. $PSScriptRoot\..\update-docker-rc.ps1
+. $PSScriptRoot\..\update-docker-ce.ps1
 
 Write-Host Building registry binary and image
 docker build -t registry .
diff --git a/update-docker-ce.ps1 b/update-docker-ce.ps1
@@ -1,7 +1,7 @@
 $ErrorActionPreference = 'Stop'
 $ProgressPreference = 'SilentlyContinue'
 
-$version = "17.05.0-ce-rc3"
+$version = "17.05.0-ce"
 if ($(docker --version).StartsWith("Docker version $version")) {
   Write-Host Already updated.
   exit 0;
@@ -12,7 +12,7 @@ Stop-Service docker
 
 Write-Host "Downloading docker-$version.zip"
 $wc = New-Object net.webclient
-$wc.DownloadFile("https://test.docker.com/builds/Windows/x86_64/docker-$version.zip", "$env:TEMP\docker-$version.zip")
+$wc.DownloadFile("https://get.docker.com/builds/Windows/x86_64/docker-$version.zip", "$env:TEMP\docker-$version.zip")
 Write-Host "Extracting docker-$version.zip"
 Expand-Archive -Path "$env:TEMP\docker-$version.zip" -DestinationPath $env:ProgramFiles -Force
 Remove-Item "$env:TEMP\docker-$version.zip"
diff --git a/webserver/build.ps1 b/webserver/build.ps1
@@ -1,3 +1,3 @@
-. $PSScriptRoot\..\update-docker-rc.ps1
+. $PSScriptRoot\..\update-docker-ce.ps1
 
 docker build -t webserver .

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-. $PSScriptRoot\..\update-docker-rc.ps1`
	`1`	`+. $PSScriptRoot\..\update-docker-ce.ps1`
`2`	`2`
`3`	`3`	`function buildVersion($majorMinorPatch, $majorMinor, $major) {`
`4`	`4`	`docker build -t node:$majorMinorPatch $majorMinor`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-. $PSScriptRoot\..\update-docker-rc.ps1`
	`1`	`+. $PSScriptRoot\..\update-docker-ce.ps1`
`2`	`2`
`3`	`3`	`docker build -t prometheus .`