From ae44b6fad047cda5959db4435d0dbe7a3e6e534f Mon Sep 17 00:00:00 2001 From: Natalia Kondratyeva Date: Thu, 19 Oct 2023 00:46:43 +0200 Subject: [PATCH] Update MsQuic on Ubuntu 18.04 (#921) Co-authored-by: Logan Bussell --- src/ubuntu/18.04/helix/arm32v7/Dockerfile | 6 ++++-- src/ubuntu/18.04/helix/arm64v8/Dockerfile | 2 +- src/ubuntu/20.04/helix/wasm/amd64/Dockerfile | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/ubuntu/18.04/helix/arm32v7/Dockerfile b/src/ubuntu/18.04/helix/arm32v7/Dockerfile index 6ff67f2e2..24892027b 100644 --- a/src/ubuntu/18.04/helix/arm32v7/Dockerfile +++ b/src/ubuntu/18.04/helix/arm32v7/Dockerfile @@ -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 \ @@ -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 && \ diff --git a/src/ubuntu/18.04/helix/arm64v8/Dockerfile b/src/ubuntu/18.04/helix/arm64v8/Dockerfile index 5cb31f99e..ace681a17 100644 --- a/src/ubuntu/18.04/helix/arm64v8/Dockerfile +++ b/src/ubuntu/18.04/helix/arm64v8/Dockerfile @@ -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 diff --git a/src/ubuntu/20.04/helix/wasm/amd64/Dockerfile b/src/ubuntu/20.04/helix/wasm/amd64/Dockerfile index 9f8b59224..f2749aeb6 100644 --- a/src/ubuntu/20.04/helix/wasm/amd64/Dockerfile +++ b/src/ubuntu/20.04/helix/wasm/amd64/Dockerfile @@ -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