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.

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

Jump to bottom

update msquic to 2.1.1 for Ubuntu arm64 #687

Merged
merged 4 commits into from
Sep 9, 2022
Merged

update msquic to 2.1.1 for Ubuntu arm64 #687

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7b73324
update msquic to 2.1.1 for Ubuntu arm64
wfurt Sep 8, 2022
9493d3f
Merge branch 'main' of https://github.com/dotnet/dotnet-buildtools-pr…
wfurt Sep 8, 2022
6c91216
fix build
wfurt Sep 8, 2022
777c06f
update
wfurt Sep 9, 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
24 changes: 10 additions & 14 deletions src/ubuntu/18.04/helix/arm64v8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ RUN apt-get update && \
libgdiplus \
libicu-dev \
libnuma-dev \
liblttng-ust-dev \
libssl-dev \
libtool \
libunwind8 \
Expand All @@ -30,6 +29,7 @@ RUN apt-get update && \
locales-all \
python3-dev \
python3-pip \
software-properties-common \
sudo \
tzdata \
unzip \
Expand All @@ -50,19 +50,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 -r 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/ubuntu/18.04/prod && \
apt-get update && \
apt-get install -y libmsquic && \
wfurt marked this conversation as resolved.
Show resolved Hide resolved
rm -rf /var/lib/apt/lists/*

RUN adduser --disabled-password --gecos '' --uid 1001 --shell /bin/bash --ingroup adm helixbot && \
chmod -R +x /root && \
Expand Down
24 changes: 10 additions & 14 deletions src/ubuntu/22.04/helix/arm64v8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ RUN apt-get update && \
libgdiplus \
libicu-dev \
libnuma-dev \
liblttng-ust-dev \
libssl-dev \
libtool \
libunwind8 \
Expand All @@ -30,6 +29,7 @@ RUN apt-get update && \
locales-all \
python3-dev \
python3-pip \
software-properties-common \
sudo \
tzdata \
unzip \
Expand All @@ -47,19 +47,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 -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 -r 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/ubuntu/22.04/prod && \
apt-get update && \
apt-get install -y libmsquic && \
rm -rf /var/lib/apt/lists/*

RUN adduser --disabled-password --gecos '' --uid 1001 --shell /bin/bash --ingroup adm helixbot && \
chmod -R +x /root && \
Expand Down