Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use msquic from Alpine testing repository #1193

Merged
merged 1 commit into from
Aug 26, 2024
Merged

Use msquic from Alpine testing repository #1193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 2 additions & 35 deletions src/alpine/3.17/helix/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,3 @@
FROM library/alpine:3.17 AS msquic
ARG TARGETARCH

# build MsQuic as we don't have packages
RUN apk add --upgrade --no-cache \
cmake \
g++ \
gcc \
git \
numactl-dev \
linux-headers \
lttng-ust-dev \
make \
musl-dev \
openssl-dev \
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 library/alpine:3.17 AS venv

RUN apk add --upgrade --no-cache \
Expand Down Expand Up @@ -72,8 +39,8 @@ RUN apk add --upgrade --no-cache \
sudo \
tzdata

# Copy msquic from the msquic image into our image that will run on Helix
COPY --from=msquic /msquic /usr
# Install libmsquic from testing repository
RUN apk add --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing/ libmsquic

# Needed for runtime tests to pass
ENV LANG=en-US.UTF-8
Expand Down
37 changes: 2 additions & 35 deletions src/alpine/3.18/helix/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,3 @@
FROM library/alpine:3.18 AS msquic
ARG TARGETARCH

# build MsQuic as we don't have packages
RUN apk add --upgrade --no-cache \
cmake \
g++ \
gcc \
git \
numactl-dev \
linux-headers \
lttng-ust-dev \
make \
musl-dev \
openssl-dev \
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 library/alpine:3.18 AS venv

RUN apk add --upgrade --no-cache \
Expand Down Expand Up @@ -67,8 +34,8 @@ RUN apk add --upgrade --no-cache \
sudo \
tzdata

# Copy msquic from the msquic image into our image that will run on Helix
COPY --from=msquic /msquic /usr
# Install libmsquic from testing repository
RUN apk add --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing/ libmsquic

# Needed for runtime tests to pass
ENV LANG=en-US.UTF-8
Expand Down
37 changes: 2 additions & 35 deletions src/alpine/3.20/helix/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,3 @@
FROM library/alpine:3.20 AS msquic
ARG TARGETARCH

# build MsQuic as we don't have packages
RUN apk add --upgrade --no-cache \
cmake \
g++ \
gcc \
git \
numactl-dev \
linux-headers \
lttng-ust-dev \
make \
musl-dev \
openssl-dev \
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 library/alpine:3.20 AS venv

RUN apk add --upgrade --no-cache \
Expand Down Expand Up @@ -70,8 +37,8 @@ RUN apk add --upgrade --no-cache \
sudo \
tzdata

# Copy msquic from the msquic image into our image that will run on Helix
COPY --from=msquic /msquic /usr
# Install libmsquic from testing repository
RUN apk add --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing/ libmsquic

# Needed for runtime tests to pass
ENV LANG=en-US.UTF-8
Expand Down