Skip to content
This repository has been archived by the owner on Jan 11, 2023. It is now read-only.

Update Windows images to 1803 #2958

Merged
merged 1 commit into from
May 15, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docs/kubernetes/windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ After completing this walkthrough you will know how to:
spec:
containers:
- name: windowswebserver
image: microsoft/windowsservercore:1709
image: microsoft/windowsservercore:1803
command:
- powershell.exe
- -command
Expand Down Expand Up @@ -253,7 +253,7 @@ spec:
containers:

- name: iis-container
image: microsoft/iis:windowsservercore-1709
image: microsoft/iis:windowsservercore-1803
volumeMounts:
- name: shared-data
mountPath: /wwwcache
Expand All @@ -263,7 +263,7 @@ spec:
- "while ($true) { Start-Sleep -Seconds 10; Copy-Item -Path C:\\wwwcache\\iisstart.htm -Destination C:\\inetpub\\wwwroot\\iisstart.htm; }"

- name: servercore-container
image: microsoft/windowsservercore:1709
image: microsoft/windowsservercore:1803
volumeMounts:
- name: shared-data
mountPath: /poddata
Expand Down
2 changes: 1 addition & 1 deletion parts/k8s/kubernetesmastervars.t
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@
"windowsTelemetryGUID": "[parameters('windowsTelemetryGUID')]",
"agentWindowsPublisher": "MicrosoftWindowsServer",
"agentWindowsOffer": "WindowsServerSemiAnnual",
"agentWindowsSku": "Datacenter-Core-1709-with-Containers-smalldisk",
"agentWindowsSku": "Datacenter-Core-1803-with-Containers-smalldisk",
"agentWindowsVersion": "[parameters('agentWindowsVersion')]",
"windowsCustomScriptSuffix": " $inputFile = '%SYSTEMDRIVE%\\AzureData\\CustomData.bin' ; $outputFile = '%SYSTEMDRIVE%\\AzureData\\CustomDataSetupScript.ps1' ; Copy-Item $inputFile $outputFile ; Invoke-Expression('{0} {1}' -f $outputFile, $arguments) ; "
{{end}}
Expand Down
2 changes: 1 addition & 1 deletion parts/windowsparams.t
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"type": "string"
},
"agentWindowsSku": {
"defaultValue": "Datacenter-Core-1709-with-Containers-smalldisk",
"defaultValue": "Datacenter-Core-1803-with-Containers-smalldisk",
"metadata": {
"description": "The SKU of windows image for the agent virtual machines."
},
Expand Down
2 changes: 1 addition & 1 deletion test/cluster-tests/kubernetes/simpleweb-windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ spec:
spec:
containers:
- name: windowswebserver
image: microsoft/windowsservercore:1709
image: microsoft/windowsservercore:1803
command:
- powershell.exe
- -command
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/kubernetes/workloads/iis-azurefile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
name: storage
spec:
containers:
- image: microsoft/iis:windowsservercore-1709
- image: microsoft/iis:windowsservercore-1803
name: iis-azurefile
volumeMounts:
- name: azurefilevol
Expand Down
2 changes: 1 addition & 1 deletion windows/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM microsoft/nanoserver:1709
FROM microsoft/nanoserver:1803

CMD cmd /c ping -t localhost