diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index ce1230dc698eca79425596634b24cc7b6a84159c..ea14e93a1590e5ff6a8a6e2a70cf22132cb0cd10 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -7,9 +7,9 @@ trigger: batch: true branches: include: - - master + - main - release/* - - internal/release/3.* + - internal/release/* # Run PR validation on all branches pr: diff --git a/eng/docker/rhel.Dockerfile b/eng/docker/rhel.Dockerfile index d42ab7b389936e28e09ef7e4aa341ecab2e4c62c..3305ca5d2fe3bd320203671e297cef7c3f9c48ad 100644 --- a/eng/docker/rhel.Dockerfile +++ b/eng/docker/rhel.Dockerfile @@ -1,5 +1,5 @@ # Dockerfile that creates a container suitable to build dotnet-cli -FROM mcr.microsoft.com/dotnet-buildtools/prereqs:rhel-7-rpmpkg-e1b4a89-20175311035359 +FROM mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-rpmpkg # Setup User to match Host User, and give superuser permissions ARG USER diff --git a/eng/docker/ubuntu-alpine37.Dockerfile b/eng/docker/ubuntu-alpine37.Dockerfile index 7cc731257db5281b954e3cf6aca607cc8a22ef70..1e0bb236046a3049e9d50b05afbc923c89e97d42 100644 --- a/eng/docker/ubuntu-alpine37.Dockerfile +++ b/eng/docker/ubuntu-alpine37.Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm64-alpine-85814b7-20200327151156 +FROM mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm64-alpine ARG USER ARG USER_ID ARG GROUP_ID