From b08fe88b979babf7d8c89b4013e84e7598e1a418 Mon Sep 17 00:00:00 2001
From: Rich Lander <rich@lander.ca>
Date: Mon, 9 Dec 2024 19:38:15 -0800
Subject: [PATCH] Update libmsqic source

---
 src/debian/13/helix/Dockerfile | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/debian/13/helix/Dockerfile b/src/debian/13/helix/Dockerfile
index 0e76e747..32d53e46 100644
--- a/src/debian/13/helix/Dockerfile
+++ b/src/debian/13/helix/Dockerfile
@@ -8,8 +8,7 @@ RUN apt-get install -y \
         coreutils \
         python3-dev \
         python3-pip \
-        python3-venv \
-    && rm -rf /var/lib/apt/lists/*
+        python3-venv
 
 RUN python3 -m venv /venv \
     && . /venv/bin/activate \
@@ -20,14 +19,12 @@ FROM base
 ARG TARGETARCH
 
 # Install Helix Dependencies
-RUN apt-get install -y \
+RUN LIBCURL=libcurl4 \
+    && if [ "$TARGETARCH" = "arm" ]; then \
+           LIBCURL="libcurl4t64"; fi \ 
+    && apt-get install -y \
         apt-transport-https \
         curl \
-    && curl -sOL https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb \
-    && dpkg -i packages-microsoft-prod.deb \
-    && rm packages-microsoft-prod.deb \
-    && apt-get update \
-    && apt-get install -y \
         autoconf \
         automake \
         at \
@@ -38,9 +35,8 @@ RUN apt-get install -y \
         iputils-ping \
         libcurl4 \
         libffi-dev \
-        libgdiplus \
         libicu-dev \
-        libmsquic \
+        libnuma1 \
         libssl-dev \
         libtool \
         libunwind8 \
@@ -57,6 +53,10 @@ RUN apt-get install -y \
     && rm -rf /var/lib/apt/lists/* \
     && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
 
+RUN curl -O https://packages.microsoft.com/ubuntu/24.04/prod/pool/main/libm/libmsquic/libmsquic_2.4.7_$TARGETARCH.deb \
+    && dpkg -i libmsquic* \
+    && rm libmsquic*
+
 ENV LANG=en_US.utf8
 
 # Create helixbot user and give rights to sudo without password