Skip to content

Commit 4a729ad

Browse files
Merge pull request #122 from StefanScherer/use-17-05-rc-1
Use one script to update to Docker 17.05.0-rc1
2 parents 116485c + b92ae57 commit 4a729ad

5 files changed

Lines changed: 22 additions & 28 deletions

File tree

mongo/3.4/build.ps1

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
Write-Host Updating Docker engine to master
2-
Stop-Service docker
3-
$wc = New-Object net.webclient
4-
$wc.Downloadfile("https://master.dockerproject.org/windows/amd64/dockerd.exe", "$env:ProgramFiles\docker\dockerd.exe")
5-
$wc.Downloadfile("https://master.dockerproject.org/windows/amd64/docker.exe", "$env:ProgramFiles\docker\docker.exe")
6-
Start-Service docker
7-
docker version
1+
. $PSScriptRoot\..\..\update-docker-rc.ps1
82

93
Write-Host Building Mongo image for Nanoserver
104
docker build -t mongo:nano -f Dockerfile .

node/build.ps1

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
Write-Host Updating Docker engine to master for PR docker/docker#31257
2-
Stop-Service docker
3-
$wc = New-Object net.webclient
4-
$wc.Downloadfile("https://master.dockerproject.org/windows/amd64/dockerd.exe", "$env:ProgramFiles\docker\dockerd.exe")
5-
$wc.Downloadfile("https://master.dockerproject.org/windows/amd64/docker.exe", "$env:ProgramFiles\docker\docker.exe")
6-
Start-Service docker
7-
docker version
1+
. $PSScriptRoot\..\update-docker-rc.ps1
82

93
function buildVersion($majorMinorPatch, $majorMinor, $major) {
104
docker build -t node:$majorMinorPatch $majorMinor

registry/build.ps1

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
Write-Host Updating Docker engine to master
2-
Stop-Service docker
3-
$wc = New-Object net.webclient
4-
$wc.Downloadfile("https://master.dockerproject.org/windows/amd64/dockerd.exe", "$env:ProgramFiles\docker\dockerd.exe")
5-
$wc.Downloadfile("https://master.dockerproject.org/windows/amd64/docker.exe", "$env:ProgramFiles\docker\docker.exe")
6-
Start-Service docker
7-
docker version
1+
. $PSScriptRoot\..\update-docker-rc.ps1
82

93
Write-Host Building registry binary and image
104
docker build -t registry .

update-docker-rc.ps1

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
$ErrorActionPreference = 'Stop'
2+
$ProgressPreference = 'SilentlyContinue'
3+
4+
Write-Host "Stopping docker service"
5+
Stop-Service docker
6+
$version = "17.05.0-ce-rc1"
7+
8+
Write-Host "Downloading docker-$version.zip"
9+
$wc = New-Object net.webclient
10+
$wc.DownloadFile("https://test.docker.com/builds/Windows/x86_64/docker-$version.zip", "$env:TEMP\docker-$version.zip")
11+
Write-Host "Extracting docker-$version.zip"
12+
Expand-Archive -Path "$env:TEMP\docker-$version.zip" -DestinationPath $env:ProgramFiles -Force
13+
Remove-Item "$env:TEMP\docker-$version.zip"
14+
15+
Write-Host "Starting docker service"
16+
Start-Service docker
17+
18+
docker version

webserver/build.ps1

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
Write-Host Updating Docker engine to master
2-
Stop-Service docker
3-
$wc = New-Object net.webclient
4-
$wc.Downloadfile("https://master.dockerproject.org/windows/amd64/dockerd.exe", "$env:ProgramFiles\docker\dockerd.exe")
5-
$wc.Downloadfile("https://master.dockerproject.org/windows/amd64/docker.exe", "$env:ProgramFiles\docker\docker.exe")
6-
Start-Service docker
7-
docker version
1+
. $PSScriptRoot\..\update-docker-rc.ps1
82

93
docker build -t webserver .

0 commit comments

Comments
 (0)