Skip to content
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.

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

update Fedora image to have msquic 2.1.1 #688

Merged
merged 2 commits into from
Sep 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 5 additions & 11 deletions src/fedora/34/helix/amd64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,11 @@ RUN ln -sf /usr/bin/python3 /usr/bin/python && \
pip download --no-deps helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple && \
pip install ./helix_scripts-*-py3-none-any.whl

# This is temporary until we have flow to packages.microsoft.com

RUN dnf install -y dotnet gem lttng-tools perl-FindBin rpmdevtools ruby-devel && \
rpm -i https://github.com/PowerShell/PowerShell/releases/download/v7.0.6/powershell-lts-7.0.6-1.rhel.7.x86_64.rpm && \
gem install fpm && \
git clone --depth 1 --single-branch --branch release/7.0 --recursive https://github.com/dotnet/msquic && \
cd msquic/src/msquic && PATH=~/.dotnet/tools:$PATH pwsh scripts/build.ps1 -Config Release -DisableLogs && \
touch artifacts/bin/linux/x64_Release_openssl/libmsquic.lttng.so && ./scripts/make-packages.sh --output /tmp && \
rpm -i /tmp/libmsquic*rpm && \
cd ~ ; rm -rf msquic /tmp/libmsquic* && \
rpm -e powershell-lts dotnet lttng-tools perl-FindBin rpmdevtools ruby-devel && \
# MsQuic
RUN dnf install -y libmsquic && \
dnf download libmsquic-1.9* && \
rpm -i --force libmsquic-1.9* && \
rm -f libmsquic-1.9* && \
dnf clean all

# Needed for .NET corefx tests to pass
Expand Down
4 changes: 2 additions & 2 deletions src/fedora/36/helix/amd64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ RUN dnf remove -y python3-pip && \
pip download --no-deps helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple && \
pip install ./helix_scripts-*-py3-none-any.whl

# There is problem with signature on 2.0 package. --nogpgcheck should be removed once resolved.
RUN dnf install -y --nogpgcheck libmsquic && \
# MsQuic
RUN dnf install -y libmsquic && \
dnf download libmsquic-1.9* && \
rpm -i --force libmsquic-1.9* && \
rm -f libmsquic-1.9* && \
Expand Down