From 5d99cd1bd672d8538313be360dbfa7cd43569ace Mon Sep 17 00:00:00 2001 From: Matt Galbraith Date: Wed, 14 Jul 2021 16:49:23 -0700 Subject: [PATCH] Fixup docker to use 3.13 base image for MUSL legs --- .vsts-ci.yml | 4 ++-- eng/docker/{alpine.3.6 => alpine.3.13}/Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename eng/docker/{alpine.3.6 => alpine.3.13}/Dockerfile (93%) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index b552a182f..d7369c7d1 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -213,7 +213,7 @@ stages: _TestArg: '' Build_Linux_musl_Debug_x64: _BuildConfig: Debug - _DockerParameter: '--docker alpine.3.6' + _DockerParameter: '--docker alpine.3.13' _LinuxPortable: '' _RuntimeIdentifier: '--runtime-id linux-musl-x64' _BuildArchitecture: 'x64' @@ -258,7 +258,7 @@ stages: _TestArg: '' Build_Linux_musl_Release_x64: _BuildConfig: Release - _DockerParameter: '--docker alpine.3.6' + _DockerParameter: '--docker alpine.3.13' _LinuxPortable: '' _RuntimeIdentifier: '--runtime-id linux-musl-x64' _BuildArchitecture: 'x64' diff --git a/eng/docker/alpine.3.6/Dockerfile b/eng/docker/alpine.3.13/Dockerfile similarity index 93% rename from eng/docker/alpine.3.6/Dockerfile rename to eng/docker/alpine.3.13/Dockerfile index cebae7d69..272f9596a 100644 --- a/eng/docker/alpine.3.6/Dockerfile +++ b/eng/docker/alpine.3.13/Dockerfile @@ -4,7 +4,7 @@ # # Dockerfile that creates a container suitable to build dotnet-cli -FROM mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.6-3148f11-20171119021156 +FROM mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.13-20210714125444-ae5be29 RUN apk update && apk upgrade && apk add --no-cache curl ncurses