Skip to content

{ComponentFix} Combine update + install into a single transaction #33442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
msarfraz wants to merge 4 commits into
base: dev
Choose a base branch
from
+23 −6
Open

{ComponentFix} Combine update + install into a single transaction #33442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
307e71d
Combine update + install into a single transaction to avoids transien…
May 26, 2026
0f84220
drop the separate update so the install is a single resolver
May 26, 2026
2f10b3d
updated comments/commands as per copilot suggestions
May 26, 2026
fceee73
fixed ubi10 image
May 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -863,7 +863,7 @@ jobs:
pool: ${{ arch.pool }}
Red Hat Universal Base Image 10 ${{ arch.name }}:
dockerfile: ubi
image: registry.access.redhat.com/ubi10/ubi:10.0
image: registry.access.redhat.com/ubi10/ubi:10.0-1762765098
artifact: rpm-ubi10-${{ arch.value }}
python_package: python3.12
pool: ${{ arch.pool }}
Expand Down Expand Up @@ -923,7 +923,7 @@ jobs:
Red Hat Universal Base Image 10 ${{ arch.name }}:
artifact: rpm-ubi10-${{ arch.value }}
distro: el10
image: registry.access.redhat.com/ubi10/ubi:10.0
image: registry.access.redhat.com/ubi10/ubi:10.0-1762765098
python_package: python3.12
python_cmd: python3.12
pip_cmd: pip3.12
Expand Down
9 changes: 8 additions & 1 deletion scripts/release/rpm/fedora.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,14 @@ FROM ${image} AS build-env
ARG cli_version=dev
ARG python_package=python3

RUN dnf update -y
# Install build dependencies in a single dnf transaction so the resolver
# picks a mutually consistent set of packages. A separate `dnf update -y`
# step is intentionally avoided: if the configured repositories are
# temporarily out of sync (e.g. a newer glibc-devel is published before
# the matching glibc, or vice versa), updating first can pin a package
# to a version whose tightly-coupled companion is not yet available,
# breaking the subsequent install. The base image already ships with
# updates, and any newer transitive dependencies will be pulled in here.
RUN dnf install -y wget rpm-build gcc libffi-devel ${python_package}-devel openssl-devel make bash coreutils diffutils patch dos2unix perl

WORKDIR /azure-cli
Expand Down
16 changes: 13 additions & 3 deletions scripts/release/rpm/ubi.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,14 @@ FROM ${image} AS build-env
ARG cli_version=dev
ARG python_package=python3.12

RUN yum update -y
# Install build dependencies in a single yum transaction so the resolver
# picks a mutually consistent set of packages. A separate `yum update -y`
# step is intentionally avoided: when BaseOS and AppStream are temporarily
# out of sync (e.g. AppStream ships glibc-devel-X but BaseOS has not yet
# published the matching glibc-X), updating first pins glibc to a version
# that no installable glibc-devel matches, which then breaks `gcc` install.
# The base UBI image already ships with security updates; `yum install`
# will pull any newer transitive dependencies it needs.
Comment on lines +11 to +17
RUN yum install -y wget rpm-build gcc libffi-devel ${python_package}-devel openssl-devel make bash diffutils patch dos2unix perl

WORKDIR /azure-cli
Expand All @@ -25,8 +32,11 @@ RUN --mount=type=secret,id=PIP_INDEX_URL export PIP_INDEX_URL=$(cat /run/secrets

FROM ${image} AS execution-env

RUN yum update -y

# Install the built RPM in a single yum transaction (no standalone
# `yum update -y` beforehand) for the same reason as the build stage:
# avoid BaseOS/AppStream repo-sync skew failures. The base UBI image
# already ships with security updates, and any newer transitive
# dependencies required by azure-cli will be pulled in by this install.
COPY --from=build-env /azure-cli-dev.rpm ./
RUN yum install -y ./azure-cli-dev.rpm && \
az --version
Loading