Skip to content

Commit 1250977

Browse files
Copilotrichlander
andcommitted
Regularize libmsquic installation: use distro-appropriate repos and update version
Co-authored-by: richlander <2608468+richlander@users.noreply.github.com>
1 parent 29c0482 commit 1250977

4 files changed

Lines changed: 4 additions & 7 deletions

File tree

src/almalinux/10/helix/amd64/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ FROM library/almalinux:10
2121
RUN dnf upgrade --refresh -y \
2222
&& dnf install --setopt tsflags=nodocs -y \
2323
dnf-plugins-core \
24-
&& dnf config-manager --add-repo=https://packages.microsoft.com/rhel/9/prod/config.repo \
24+
&& dnf config-manager --add-repo=https://packages.microsoft.com/rhel/10/prod/config.repo \
2525
&& dnf install --setopt tsflags=nodocs -y --allowerasing \
2626
cpio \
2727
file \

src/almalinux/8/helix/amd64/Dockerfile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@ FROM library/almalinux:8
33
RUN dnf upgrade --refresh -y \
44
&& dnf install --setopt tsflags=nodocs -y \
55
'dnf-command(config-manager)' \
6-
# Add microsoft centos/8 repo for libmsquic.
7-
# (Use centos/8 rather than rhel/8 because the latter doesn't have
8-
# libmsquic except in the 8.1-specific packages feed.)
9-
&& dnf config-manager --add-repo=https://packages.microsoft.com/centos/8/prod/config.repo \
6+
&& dnf config-manager --add-repo=https://packages.microsoft.com/rhel/8/prod/config.repo \
107
&& dnf install --setopt tsflags=nodocs -y \
118
# Get recent python3 This is needed to get a pip recent enough
129
# not to fail the build when installing cryptography library as

src/centos-stream/10/helix/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ FROM quay.io/centos/centos:stream10
2020
RUN dnf upgrade --refresh -y \
2121
&& dnf install --setopt tsflags=nodocs -y \
2222
dnf-plugins-core \
23-
&& dnf config-manager --add-repo=https://packages.microsoft.com/rhel/9/prod/config.repo \
23+
&& dnf config-manager --add-repo=https://packages.microsoft.com/rhel/10/prod/config.repo \
2424
&& dnf install --setopt tsflags=nodocs -y --allowerasing \
2525
autoconf \
2626
automake \

src/ubuntu/26.04/helix/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ RUN python3 -m venv /venv \
2121

2222
FROM ubuntu.azurecr.io/ubuntu:26.04
2323
ARG TARGETARCH
24-
ARG LIBMSQUIC_VERSION=2.4.8
24+
ARG LIBMSQUIC_VERSION=2.5.6
2525
ENV DEBIAN_FRONTEND=noninteractive
2626

2727
RUN LIBCURL=libcurl4 \

0 commit comments

Comments
 (0)