Skip to content

Commit

Permalink
[release/3.1] Use simpler Docker tags (#45118)
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
dougbu authored Nov 16, 2022
1 parent 32bb61e commit 47f93ef
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .azure/pipelines/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ trigger:
batch: true
branches:
include:
- master
- main
- release/*
- internal/release/3.*
- internal/release/*

# Run PR validation on all branches
pr:
Expand Down
2 changes: 1 addition & 1 deletion eng/docker/rhel.Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion eng/docker/ubuntu-alpine37.Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 47f93ef

Please sign in to comment.