diff options
| author | Sebastiaan van Stijn <github@gone.nl> | 2022-06-30 11:24:46 +0200 |
|---|---|---|
| committer | Sebastiaan van Stijn <github@gone.nl> | 2022-06-30 14:28:37 +0200 |
| commit | 4e632a13c3e0e4a73874e10990ff07748c844707 (patch) | |
| tree | abea3106ea785739441fe71f81343ef5ce6fa33d /Dockerfile.windows | |
| parent | 90fce781d9a16f367a87d2784b7987ec7fecf7a9 (diff) | |
| download | docker-4e632a13c3e0e4a73874e10990ff07748c844707.tar.gz | |
Dockerfile: use consistent format for CONTAINERD_VERSION
The Windows Dockerfile did not use a "v" prefix, whereas the
hack/dockerfile/install/containerd.installer did. While we're
not overriding these versions currently through build-args, doing
so would result in one of them being incorrect.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Diffstat (limited to 'Dockerfile.windows')
| -rw-r--r-- | Dockerfile.windows | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Dockerfile.windows b/Dockerfile.windows index 465a5476e0..d189b011de 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -166,7 +166,7 @@ FROM microsoft/windowsservercore SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ARG GO_VERSION=1.18.3 -ARG CONTAINERD_VERSION=1.6.6 +ARG CONTAINERD_VERSION=v1.6.6 ARG GOTESTSUM_VERSION=v1.8.1 ARG GOWINRES_VERSION=v0.2.3 @@ -259,7 +259,7 @@ RUN ` ` Write-Host INFO: Downloading containerd; ` Install-Package -Force 7Zip4PowerShell; ` - $location='https://github.com/containerd/containerd/releases/download/v'+$Env:CONTAINERD_VERSION+'/containerd-'+$Env:CONTAINERD_VERSION+'-windows-amd64.tar.gz'; ` + $location='https://github.com/containerd/containerd/releases/download/'+$Env:CONTAINERD_VERSION+'/containerd-'+$Env:CONTAINERD_VERSION.TrimStart('v')+'-windows-amd64.tar.gz'; ` Download-File $location C:\containerd.tar.gz; ` New-Item -Path C:\containerd -ItemType Directory; ` Expand-7Zip C:\containerd.tar.gz C:\; ` |