Skip to content

Commit

Permalink
Update MsQuic on Ubuntu 18.04 (#921)
Browse files Browse the repository at this point in the history
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
  • Loading branch information
CarnaViire and lbussell committed Oct 18, 2023
1 parent 1bc0fbe commit ae44b6f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
6 changes: 4 additions & 2 deletions src/ubuntu/18.04/helix/arm32v7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ RUN apt-get update && \
locales-all \
python3-dev \
python3-pip \
# cryptography wheel requires rust to build on arm32
rust-all \
sudo \
tzdata \
unzip \
Expand All @@ -50,14 +52,14 @@ RUN apt-get update && \
# Add MsQuic
# MsQuic did not publish arm32 package for 18.04
# Use direct link to signed binary for now
RUN curl -LO https://packages.microsoft.com/ubuntu/20.04/prod/pool/main/libm/libmsquic/libmsquic_2.2.2_armhf.deb && \
RUN curl -LO https://packages.microsoft.com/ubuntu/20.04/prod/pool/main/libm/libmsquic/libmsquic_2.2.3_armhf.deb && \
dpkg -i libmsquic_*_armhf.deb && \
rm -f libmsquic_*_armhf.deb

ENV LANG=en_US.utf8

RUN ln -sf /usr/bin/python3 /usr/bin/python && \
python -m pip install --upgrade pip==20.2 && \
python -m pip install --upgrade pip==21.3.1 && \
python -m pip install virtualenv==16.6.0 && \
pip download --no-deps helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple && \
export CRYPTOGRAPHY_DONT_BUILD_RUST=1 && \
Expand Down
2 changes: 1 addition & 1 deletion src/ubuntu/18.04/helix/arm64v8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ RUN ln -sf /usr/bin/python3 /usr/bin/python && \
# Add MsQuic
# MsQuic did not publish arm64 package for 18.04
# Use direct link to signed binary for now
RUN curl -LO https://packages.microsoft.com/ubuntu/20.04/prod/pool/main/libm/libmsquic/libmsquic_2.2.2_arm64.deb && \
RUN curl -LO https://packages.microsoft.com/ubuntu/20.04/prod/pool/main/libm/libmsquic/libmsquic_2.2.3_arm64.deb && \
dpkg -i libmsquic_*_arm64.deb && \
rm -f libmsquic_*_arm64.deb

Expand Down
2 changes: 1 addition & 1 deletion src/ubuntu/20.04/helix/wasm/amd64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN apt-get clean && \
USER helixbot

# update node, which is required for newer npm, jsvu and v8
ENV NODE_VERSION 18.12.1
ENV NODE_VERSION 18.18.2
RUN cd ~ && \
curl -LO https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz && \
tar xf node-v${NODE_VERSION}-linux-x64.tar.xz
Expand Down

0 comments on commit ae44b6f

Please sign in to comment.