Skip to content

Commit 8c8324b

Browse files
committed
Dockerfile.windows: remove deprecated 7Zip4Powershell
`tar` utility is included in Windows 10 (17063+) and Windows Server 2019+ so we can use it directly. Signed-off-by: Paweł Gronowski <[email protected]>
1 parent f835ff6 commit 8c8324b

1 file changed

Lines changed: 1 addition & 4 deletions

File tree

Dockerfile.windows

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -258,14 +258,11 @@ RUN `
258258
Remove-Item C:\gitsetup.zip; `
259259
`
260260
Write-Host INFO: Downloading containerd; `
261-
Install-Package -Force 7Zip4PowerShell; `
262261
$location='https://github.com/containerd/containerd/releases/download/'+$Env:CONTAINERD_VERSION+'/containerd-'+$Env:CONTAINERD_VERSION.TrimStart('v')+'-windows-amd64.tar.gz'; `
263262
Download-File $location C:\containerd.tar.gz; `
264263
New-Item -Path C:\containerd -ItemType Directory; `
265-
Expand-7Zip C:\containerd.tar.gz C:\; `
266-
Expand-7Zip C:\containerd.tar C:\containerd; `
264+
tar -xzf C:\containerd.tar.gz -C C:\containerd; `
267265
Remove-Item C:\containerd.tar.gz; `
268-
Remove-Item C:\containerd.tar; `
269266
`
270267
# Ensure all directories exist that we will require below....
271268
$srcDir = """$Env:GOPATH`\src\github.com\docker\docker\bundles"""; `

0 commit comments

Comments
 (0)