From f3359f3c6b43f31ae637a570a266d1e4819425c4 Mon Sep 17 00:00:00 2001 From: Ahmet Ibrahim Aksoy Date: Sun, 25 Aug 2024 22:40:09 +0200 Subject: [PATCH] Use msquic from Alpine testing repository --- src/alpine/3.17/helix/Dockerfile | 37 ++------------------------------ src/alpine/3.18/helix/Dockerfile | 37 ++------------------------------ src/alpine/3.20/helix/Dockerfile | 37 ++------------------------------ 3 files changed, 6 insertions(+), 105 deletions(-) diff --git a/src/alpine/3.17/helix/Dockerfile b/src/alpine/3.17/helix/Dockerfile index da481f239..a71cb8f95 100644 --- a/src/alpine/3.17/helix/Dockerfile +++ b/src/alpine/3.17/helix/Dockerfile @@ -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 \ @@ -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 diff --git a/src/alpine/3.18/helix/Dockerfile b/src/alpine/3.18/helix/Dockerfile index 476ace61f..0591d1fc2 100644 --- a/src/alpine/3.18/helix/Dockerfile +++ b/src/alpine/3.18/helix/Dockerfile @@ -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 \ @@ -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 diff --git a/src/alpine/3.20/helix/Dockerfile b/src/alpine/3.20/helix/Dockerfile index 0b795de04..75143d567 100644 --- a/src/alpine/3.20/helix/Dockerfile +++ b/src/alpine/3.20/helix/Dockerfile @@ -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 \ @@ -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