Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add libmsquic dependencies
Browse files Browse the repository at this point in the history
richlander committed Dec 10, 2024
1 parent a21af0a commit d6babe2
Showing 2 changed files with 22 additions and 16 deletions.
26 changes: 16 additions & 10 deletions src/debian/13/helix/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
FROM library/debian:trixie AS base
FROM library/debian:trixie AS venv

RUN apt-get update

FROM base AS venv

RUN apt-get install -y \
RUN apt-get update \
&& apt-get install -y \
coreutils \
python3-dev \
python3-pip \
python3-venv
python3-venv \
&& rm -rf /var/lib/apt/lists/*

RUN python3 -m venv /venv \
&& . /venv/bin/activate \
&& pip download --no-deps helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple \
&& pip install ./helix_scripts-*-py3-none-any.whl

FROM base
FROM library/debian:trixie
ARG TARGETARCH

# Install Helix Dependencies
RUN LIBCURL=libcurl4 \
&& if [ "$TARGETARCH" = "arm" ]; then \
LIBCURL="libcurl4t64"; fi \
LIBCURL="libcurl4t64"; fi \
&& apt-get update \
&& apt-get upgrade -y \
&& apt-get install -y \
apt-transport-https \
curl \
@@ -36,7 +36,6 @@ RUN LIBCURL=libcurl4 \
libcurl4 \
libffi-dev \
libicu-dev \
libnuma1 \
libssl-dev \
libtool \
libunwind8 \
@@ -50,6 +49,13 @@ RUN LIBCURL=libcurl4 \
sudo \
tzdata \
unzip \
# libmsquic dependencies
libbpf1 \
libelf1t64 \
libnl-3-200 \
libnl-route-3-200 \
libnuma1 \
libxdp1 \
&& rm -rf /var/lib/apt/lists/* \
&& localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8

12 changes: 6 additions & 6 deletions src/debian/manifest.json
Original file line number Diff line number Diff line change
@@ -127,28 +127,28 @@
{
"platforms": [
{
"architecture": "arm",
"architecture": "arm64",
"dockerfile": "src/debian/13/helix/",
"os": "linux",
"osVersion": "trixie",
"tags": {
"debian-13-helix-arm32v7": {}
"debian-13-helix-arm64v8": {}
},
"variant": "v7"
"variant": "v8"
}
]
},
{
"platforms": [
{
"architecture": "arm64",
"architecture": "arm",
"dockerfile": "src/debian/13/helix/",
"os": "linux",
"osVersion": "trixie",
"tags": {
"debian-13-helix-arm64v8": {}
"debian-13-helix-arm32v7": {}
},
"variant": "v8"
"variant": "v7"
}
]
}

0 comments on commit d6babe2

Please sign in to comment.