`tar` utility is included in Windows 10 (17063+) and Windows Server
2019+ so we can use it directly.
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
| ... | ... |
@@ -258,14 +258,11 @@ RUN ` |
| 258 | 258 |
Remove-Item C:\gitsetup.zip; ` |
| 259 | 259 |
` |
| 260 | 260 |
Write-Host INFO: Downloading containerd; ` |
| 261 |
- Install-Package -Force 7Zip4PowerShell; ` |
|
| 262 | 261 |
$location='https://github.com/containerd/containerd/releases/download/'+$Env:CONTAINERD_VERSION+'/containerd-'+$Env:CONTAINERD_VERSION.TrimStart('v')+'-windows-amd64.tar.gz'; `
|
| 263 | 262 |
Download-File $location C:\containerd.tar.gz; ` |
| 264 | 263 |
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; ` |
|
| 267 | 265 |
Remove-Item C:\containerd.tar.gz; ` |
| 268 |
- Remove-Item C:\containerd.tar; ` |
|
| 269 | 266 |
` |
| 270 | 267 |
# Ensure all directories exist that we will require below.... |
| 271 | 268 |
$srcDir = """$Env:GOPATH`\src\github.com\docker\docker\bundles"""; ` |