Skip to content

Commit

Permalink
Switch to installing libmsquic package
Browse files Browse the repository at this point in the history
  • Loading branch information
richlander committed Aug 19, 2024
1 parent 38e30ba commit 44b3dc3
Showing 1 changed file with 1 addition and 41 deletions.
42 changes: 1 addition & 41 deletions src/azurelinux/3.0/helix/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,40 +1,3 @@
FROM mcr.microsoft.com/azurelinux/base/core:3.0 as msquic
ARG TARGETARCH

ENV LANG=en_US.utf8

# build MsQuic as we don't have packages
RUN tdnf install --refresh -y \
binutils \
build-essential \
ca-certificates-microsoft \
cmake \
gcc-c++ \
gcc \
git \
libnuma-devel \
kernel-headers \
lttng-ust-devel \
make \
openssl-devel \
perl

RUN git clone --depth 1 --single-branch --branch v2.4.3 --recursive https://github.com/microsoft/msquic /tmp/msquic

WORKDIR /tmp/msquic

RUN cmake -B build/linux/Release_openssl3 \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_TARGET_ARCHITECTURE=${TARGETARCH} \
-DQUIC_TLS=openssl3 \
-DQUIC_ENABLE_LOGGING=true \
-DQUIC_USE_SYSTEM_LIBCRYPTO=true \
-DQUIC_BUILD_TOOLS=off \
-DQUIC_BUILD_TEST=off \
-DQUIC_BUILD_PERF=off && \
cmake --build build/linux/Release_openssl3 --config Release && \
cmake --install build/linux/Release_openssl3 --prefix /msquic

FROM mcr.microsoft.com/azurelinux/base/core:3.0 as venv

RUN tdnf install --refresh -y \
Expand All @@ -60,6 +23,7 @@ RUN tdnf install --setopt tsflags=nodocs --refresh -y \
icu \
iputils \
libgcc-atomic \
libmsquic \
libnuma \
llvm \
python3 \
Expand All @@ -70,10 +34,6 @@ RUN tdnf install --setopt tsflags=nodocs --refresh -y \
which \
&& tdnf clean all


# Copy msquic from the msquic image into our image that will run on Helix
COPY --from=msquic /msquic /usr

# create helixbot user and give rights to sudo without password
RUN /usr/sbin/useradd -c '' --uid 1000 --shell /bin/bash --groups adm helixbot && \
chmod 755 /root && \
Expand Down

0 comments on commit 44b3dc3

Please sign in to comment.