Skip to content

Commit 47f93ef

Browse files
authored
[release/3.1] Use simpler Docker tags (#45118)
- analogous to 5f4bc82, Update docker tag to latest schema - This change moves all of the docker images to the -latest tag as part of #10377. - analogous to f79f2d1, Replace -latest docker tags with new schema - We changed the latest tags to not include the -latest suffix, so this change updates those tags to the new schema. - slight adjustment to images: from rhel-7-rpmpkg to centos-7-rpmpkg in rhel.Dockerfile nit: update `trigger` branch names
1 parent 32bb61e commit 47f93ef

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.azure/pipelines/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ trigger:
77
batch: true
88
branches:
99
include:
10-
- master
10+
- main
1111
- release/*
12-
- internal/release/3.*
12+
- internal/release/*
1313

1414
# Run PR validation on all branches
1515
pr:

eng/docker/rhel.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Dockerfile that creates a container suitable to build dotnet-cli
2-
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:rhel-7-rpmpkg-e1b4a89-20175311035359
2+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-rpmpkg
33

44
# Setup User to match Host User, and give superuser permissions
55
ARG USER

eng/docker/ubuntu-alpine37.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm64-alpine-85814b7-20200327151156
1+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm64-alpine
22
ARG USER
33
ARG USER_ID
44
ARG GROUP_ID

0 commit comments

Comments
 (0)