Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Update Windows docker version to 20.10.6 #906

Merged
merged 2 commits into from
Jul 14, 2021
Merged

chore: Update Windows docker version to 20.10.6 #906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
304eb57
chore: Update Windows docker version to 20.10.5
AbelHu Jul 1, 2021
1171c14
chore: Update Windows docker version to 20.10.6
AbelHu Jul 7, 2021
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
2 changes: 1 addition & 1 deletion pkg/agent/datamodel/const.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const (

const (
// KubernetesWindowsDockerVersion is the default version for docker on Windows nodes in kubernetes
KubernetesWindowsDockerVersion = "19.03.14"
KubernetesWindowsDockerVersion = "20.10.6"
// KubernetesDefaultWindowsSku is the default SKU for Windows VMs in kubernetes
KubernetesDefaultWindowsSku = "Datacenter-Core-1809-with-Containers-smalldisk"
// KubernetesDefaultContainerdWindowsSandboxIsolation is the default containerd handler for windows pods
Expand Down
2 changes: 1 addition & 1 deletion vhdbuilder/packer/generate-windows-vhd-configuration.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ $global:patchIDs = @("KB5003646")

$global:containerdPackageUrl = "https://acs-mirror.azureedge.net/containerd/windows/v0.0.41/binaries/containerd-v0.0.41-windows-amd64.tar.gz"

$global:defaultDockerVersion = "19.03.14"
$global:defaultDockerVersion = "20.10.6"

switch ($windowsSKU) {
"2019" {
Expand Down