Skip to content

update msquic to 2.1.1 #685

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

Merged
mthalman merged 2 commits into from
Sep 8, 2022
Merged

update msquic to 2.1.1 #685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5cd277
update msquic to 2.1.1
wfurt Sep 8, 2022
78b7270
add apt-add-repository
wfurt Sep 8, 2022
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
14 changes: 7 additions & 7 deletions src/debian/10/helix/amd64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ RUN ln -sf /usr/bin/python3 /usr/bin/python && \
pip install ./helix_scripts-*-py3-none-any.whl

# Add MsQuic
COPY microsoft.asc /tmp
RUN apt-key add /tmp/microsoft.asc \
&& rm /tmp/microsoft.asc \
&& apt-add-repository https://packages.microsoft.com/debian/10/prod \
&& apt-get update \
&& apt-get install -y libmsquic \
&& rm -rf /var/lib/apt/lists/*
RUN curl -LO https://packages.microsoft.com/keys/microsoft.asc && \
echo 2cfd20a306b2fa5e25522d78f2ef50a1f429d35fd30bd983e2ebffc2b80944fa microsoft.asc| sha256sum --check - && \
apt-key add microsoft.asc && \
apt-add-repository https://packages.microsoft.com/debian/10/prod && \
apt-get update && \
apt-get install libmsquic && \
rm -rf /var/lib/apt/lists/* microsoft.asc

# Create helixbot user and give rights to sudo without password
# additionally, preinstall the virtualenv packages used for VSTS reporting to save time
Expand Down
19 changes: 0 additions & 19 deletions src/debian/10/helix/amd64/microsoft.asc
View file
Open in desktop

This file was deleted.

28 changes: 10 additions & 18 deletions src/debian/10/helix/arm64v8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ RUN apt-get update && \
automake \
at \
build-essential \
cmake \
curl \
gcc \
gdb \
Expand All @@ -26,15 +27,11 @@ RUN apt-get update && \
procps \
python3-dev \
python3-pip \
software-properties-common \
sudo \
tzdata \
unzip \
&& rm -rf /var/lib/apt/lists/* \
&& curl -O https://cmake.org/files/v3.23/cmake-3.23.1-linux-aarch64.tar.gz \
&& echo "74062efddeb935bce3d33694a4db534cef9a650f77a9a153a9f217d9dc385c75 cmake-3.23.1-linux-aarch64.tar.gz" | sha256sum --check - \
&& tar -xf cmake-3.23.1-linux-aarch64.tar.gz --strip 1 -C /usr/local \
&& rm cmake-3.23.1-linux-aarch64.tar.gz \
\
&& localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8

ENV LANG=en_US.utf8
Expand All @@ -48,19 +45,14 @@ RUN ln -sf /usr/bin/python3 /usr/bin/python && \
export CRYPTOGRAPHY_DONT_BUILD_RUST=1 && \
pip install ./helix_scripts-*-py3-none-any.whl

# build MsQuic as we don't have packages
RUN cd /tmp && \
mkdir pwsh && \
cd pwsh && \
curl -LO https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell-7.2.5-linux-arm64.tar.gz && \
echo "709265A0B99232CD8AB6F8A02C01F3AEE94262B959E1A4B0FD871C8789C07396 powershell-7.2.5-linux-arm64.tar.gz" | sha256sum --check - && \
tar xf powershell-7.2.5-linux-arm64.tar.gz && \
cd .. && \
git clone --depth 1 --single-branch --branch main --recursive https://github.com/dotnet/msquic && \
cd msquic/src/msquic && PATH=~/.dotnet/tools:$PATH /tmp/pwsh/pwsh scripts/build.ps1 -arch arm64 -Config Release -UseSystemOpenSSLCrypto -DisableTools -DisableTest -DisablePerf && \
cp artifacts/bin/linux/arm64_Release_openssl/libmsquic.so.2 artifacts/bin/linux/arm64_Release_openssl/libmsquic.lttng.so.2.2.0 /usr/lib/aarch64-linux-gnu && \
cd /tmp && \
rm -rf pwsh msquic
# Add MsQuic
RUN curl -LO https://packages.microsoft.com/keys/microsoft.asc && \
echo 2cfd20a306b2fa5e25522d78f2ef50a1f429d35fd30bd983e2ebffc2b80944fa microsoft.asc| sha256sum --check - && \
apt-key add microsoft.asc && \
apt-add-repository https://packages.microsoft.com/debian/10/prod && \
apt-get update && \
apt-get install libmsquic && \
rm -rf /var/lib/apt/lists/* microsoft.asc

# Create helixbot user and give rights to sudo without password
# additionally, preinstall the virtualenv packages used for VSTS reporting to save time
Expand Down
15 changes: 8 additions & 7 deletions src/debian/11/helix/amd64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,14 @@ RUN ln -sf /usr/bin/python3 /usr/bin/python && \
pip install ./helix_scripts-*-py3-none-any.whl

# Add MsQuic
COPY microsoft.asc /tmp
RUN apt-key add /tmp/microsoft.asc \
&& rm /tmp/microsoft.asc \
&& apt-add-repository https://packages.microsoft.com/debian/11/prod \
&& apt-get update \
&& apt-get install -y libmsquic \
&& rm -rf /var/lib/apt/lists/*
RUN curl -LO https://packages.microsoft.com/keys/microsoft.asc && \
echo 2cfd20a306b2fa5e25522d78f2ef50a1f429d35fd30bd983e2ebffc2b80944fa microsoft.asc| sha256sum --check - && \
apt-key add microsoft.asc && \
rm microsoft.asc && \
apt-add-repository https://packages.microsoft.com/debian/11/prod && \
apt-get update && \
apt-get install -y libmsquic && \
rm -rf /var/lib/apt/lists/*

# Create helixbot user and give rights to sudo without password
# additionally, preinstall the virtualenv packages used for VSTS reporting to save time
Expand Down
19 changes: 0 additions & 19 deletions src/debian/11/helix/amd64/microsoft.asc
View file
Open in desktop

This file was deleted.

24 changes: 10 additions & 14 deletions src/debian/11/helix/arm64v8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ RUN apt-get update && \
libffi-dev \
libgdiplus \
libicu-dev \
liblttng-ust-dev \
libssl-dev \
libtool \
libunwind8 \
locales \
locales-all \
python3-dev \
python3-pip \
software-properties-common \
sudo \
tzdata \
unzip \
Expand All @@ -44,19 +44,15 @@ RUN ln -sf /usr/bin/python3 /usr/bin/python && \
export CRYPTOGRAPHY_DONT_BUILD_RUST=1 && \
pip install ./helix_scripts-*-py3-none-any.whl

# build MsQuic as we don't have packages
RUN cd /tmp && \
mkdir pwsh && \
cd pwsh && \
curl -LO https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell-7.2.5-linux-arm64.tar.gz && \
echo "709265A0B99232CD8AB6F8A02C01F3AEE94262B959E1A4B0FD871C8789C07396 powershell-7.2.5-linux-arm64.tar.gz" | sha256sum --check - && \
tar xf powershell-7.2.5-linux-arm64.tar.gz && \
cd .. && \
git clone --depth 1 --single-branch --branch main --recursive https://github.com/dotnet/msquic && \
cd msquic/src/msquic && PATH=~/.dotnet/tools:$PATH /tmp/pwsh/pwsh scripts/build.ps1 -arch arm64 -Config Release -UseSystemOpenSSLCrypto -DisableTools -DisableTest -DisablePerf && \
cp artifacts/bin/linux/arm64_Release_openssl/libmsquic.so.2 artifacts/bin/linux/arm64_Release_openssl/libmsquic.lttng.so.2.2.0 /usr/lib/aarch64-linux-gnu && \
cd /tmp && \
rm -rf pwsh msquic
# Add MsQuic
RUN curl -LO https://packages.microsoft.com/keys/microsoft.asc && \
echo 2cfd20a306b2fa5e25522d78f2ef50a1f429d35fd30bd983e2ebffc2b80944fa microsoft.asc| sha256sum --check - && \
apt-key add microsoft.asc && \
rm microsoft.asc && \
apt-add-repository https://packages.microsoft.com/debian/11/prod && \
apt-get update && \
apt-get install -y libmsquic && \
rm -rf /var/lib/apt/lists/*

# Create helixbot user and give rights to sudo without password
# additionally, preinstall the virtualenv packages used for VSTS reporting to save time
Expand Down