From 47f93efa997bff156faefa06ba0e2c088bb3a0c9 Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Tue, 15 Nov 2022 17:02:11 -0800
Subject: [PATCH] [release/3.1] Use simpler Docker tags (#45118)
- analogous to 5f4bc82d94f8, Update docker tag to latest schema
- This change moves all of the docker images to the -latest tag as part of #10377.
- analogous to f79f2d1ca12d, 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
---
.azure/pipelines/ci.yml | 4 ++--
eng/docker/rhel.Dockerfile | 2 +-
eng/docker/ubuntu-alpine37.Dockerfile | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
index ce1230dc698..ea14e93a159 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 d42ab7b3899..3305ca5d2fe 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 7cc731257db..1e0bb236046 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
--
GitLab