From b6a1e5c4e64812e7c5eb5ecb60481195e46e6613 Mon Sep 17 00:00:00 2001 From: ManickaP Date: Fri, 26 Apr 2024 07:28:44 +0200 Subject: [PATCH] Fixed output dir path of built msquic --- src/alpine/3.16/helix/amd64/Dockerfile | 2 +- src/alpine/3.16/helix/arm64v8/Dockerfile | 2 +- src/alpine/3.17/helix/amd64/Dockerfile | 2 +- src/alpine/3.17/helix/arm32v7/Dockerfile | 2 +- src/alpine/3.17/helix/arm64v8/Dockerfile | 2 +- src/alpine/3.18/helix/amd64/Dockerfile | 2 +- src/alpine/3.18/helix/arm32v7/Dockerfile | 2 +- src/alpine/3.18/helix/arm64v8/Dockerfile | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/alpine/3.16/helix/amd64/Dockerfile b/src/alpine/3.16/helix/amd64/Dockerfile index d6dfdd6c5..830b1077d 100644 --- a/src/alpine/3.16/helix/amd64/Dockerfile +++ b/src/alpine/3.16/helix/amd64/Dockerfile @@ -72,7 +72,7 @@ RUN apk update && apk add --no-cache && \ git clone --depth 1 --single-branch --branch main --recursive https://github.com/microsoft/msquic && \ cd msquic && \ cmake -B build/linux/x64_openssl \ - -DQUIC_OUTPUT_DIR=/tmp/msquic/src/msquic/artifacts/bin/linux/x64_Release_openssl \ + -DQUIC_OUTPUT_DIR=/tmp/msquic/artifacts/bin/linux/x64_Release_openssl \ -DCMAKE_BUILD_TYPE=Release \ -DQUIC_TLS=openssl \ -DQUIC_ENABLE_LOGGING=true \ diff --git a/src/alpine/3.16/helix/arm64v8/Dockerfile b/src/alpine/3.16/helix/arm64v8/Dockerfile index 9a8536e05..eb844866f 100644 --- a/src/alpine/3.16/helix/arm64v8/Dockerfile +++ b/src/alpine/3.16/helix/arm64v8/Dockerfile @@ -56,7 +56,7 @@ RUN apk update && apk add --no-cache && \ git clone --depth 1 --single-branch --branch main --recursive https://github.com/microsoft/msquic && \ cd msquic && \ cmake -B build/linux/arm64_openssl \ - -DQUIC_OUTPUT_DIR=/tmp/msquic/src/msquic/artifacts/bin/linux/arm64_Release_openssl \ + -DQUIC_OUTPUT_DIR=/tmp/msquic/artifacts/bin/linux/arm64_Release_openssl \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_TARGET_ARCHITECTURE=arm64 \ -DQUIC_TLS=openssl \ diff --git a/src/alpine/3.17/helix/amd64/Dockerfile b/src/alpine/3.17/helix/amd64/Dockerfile index 0135e192c..73db6910a 100644 --- a/src/alpine/3.17/helix/amd64/Dockerfile +++ b/src/alpine/3.17/helix/amd64/Dockerfile @@ -57,7 +57,7 @@ RUN apk update && apk add --no-cache && \ git clone --depth 1 --single-branch --branch main --recursive https://github.com/microsoft/msquic && \ cd msquic && \ cmake -B build/linux/x64_openssl3 \ - -DQUIC_OUTPUT_DIR=/tmp/msquic/src/msquic/artifacts/bin/linux/x64_Release_openssl3 \ + -DQUIC_OUTPUT_DIR=/tmp/msquic/artifacts/bin/linux/x64_Release_openssl3 \ -DCMAKE_BUILD_TYPE=Release \ -DQUIC_TLS=openssl3 \ -DQUIC_ENABLE_LOGGING=true \ diff --git a/src/alpine/3.17/helix/arm32v7/Dockerfile b/src/alpine/3.17/helix/arm32v7/Dockerfile index 593829337..e37a610ec 100644 --- a/src/alpine/3.17/helix/arm32v7/Dockerfile +++ b/src/alpine/3.17/helix/arm32v7/Dockerfile @@ -57,7 +57,7 @@ RUN apk update && apk add --no-cache && \ git clone --depth 1 --single-branch --branch main --recursive https://github.com/microsoft/msquic && \ cd msquic && \ cmake -B build/linux/arm_openssl3 \ - -DQUIC_OUTPUT_DIR=/tmp/msquic/src/msquic/artifacts/bin/linux/arm_Release_openssl3 \ + -DQUIC_OUTPUT_DIR=/tmp/msquic/artifacts/bin/linux/arm_Release_openssl3 \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_TARGET_ARCHITECTURE=arm \ -DQUIC_TLS=openssl3 \ diff --git a/src/alpine/3.17/helix/arm64v8/Dockerfile b/src/alpine/3.17/helix/arm64v8/Dockerfile index 3a6678185..abdeeb27b 100644 --- a/src/alpine/3.17/helix/arm64v8/Dockerfile +++ b/src/alpine/3.17/helix/arm64v8/Dockerfile @@ -56,7 +56,7 @@ RUN apk update && apk add --no-cache && \ git clone --depth 1 --single-branch --branch main --recursive https://github.com/microsoft/msquic && \ cd msquic && \ cmake -B build/linux/arm64_openssl3 \ - -DQUIC_OUTPUT_DIR=/tmp/msquic/src/msquic/artifacts/bin/linux/arm64_Release_openssl3 \ + -DQUIC_OUTPUT_DIR=/tmp/msquic/artifacts/bin/linux/arm64_Release_openssl3 \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_TARGET_ARCHITECTURE=arm64 \ -DQUIC_TLS=openssl3 \ diff --git a/src/alpine/3.18/helix/amd64/Dockerfile b/src/alpine/3.18/helix/amd64/Dockerfile index 0e64184c4..095e33330 100644 --- a/src/alpine/3.18/helix/amd64/Dockerfile +++ b/src/alpine/3.18/helix/amd64/Dockerfile @@ -57,7 +57,7 @@ RUN apk update && apk add --no-cache && \ git clone --depth 1 --single-branch --branch main --recursive https://github.com/microsoft/msquic && \ cd msquic && \ cmake -B build/linux/x64_openssl3 \ - -DQUIC_OUTPUT_DIR=/tmp/msquic/src/msquic/artifacts/bin/linux/x64_Release_openssl3 \ + -DQUIC_OUTPUT_DIR=/tmp/msquic/artifacts/bin/linux/x64_Release_openssl3 \ -DCMAKE_BUILD_TYPE=Release \ -DQUIC_TLS=openssl3 \ -DQUIC_ENABLE_LOGGING=true \ diff --git a/src/alpine/3.18/helix/arm32v7/Dockerfile b/src/alpine/3.18/helix/arm32v7/Dockerfile index 0568e403a..091826bd2 100644 --- a/src/alpine/3.18/helix/arm32v7/Dockerfile +++ b/src/alpine/3.18/helix/arm32v7/Dockerfile @@ -57,7 +57,7 @@ RUN apk update && apk add --no-cache && \ git clone --depth 1 --single-branch --branch main --recursive https://github.com/microsoft/msquic && \ cd msquic && \ cmake -B build/linux/arm_openssl3 \ - -DQUIC_OUTPUT_DIR=/tmp/msquic/src/msquic/artifacts/bin/linux/arm_Release_openssl3 \ + -DQUIC_OUTPUT_DIR=/tmp/msquic/artifacts/bin/linux/arm_Release_openssl3 \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_TARGET_ARCHITECTURE=arm \ -DQUIC_TLS=openssl3 \ diff --git a/src/alpine/3.18/helix/arm64v8/Dockerfile b/src/alpine/3.18/helix/arm64v8/Dockerfile index af8068f59..37991a093 100644 --- a/src/alpine/3.18/helix/arm64v8/Dockerfile +++ b/src/alpine/3.18/helix/arm64v8/Dockerfile @@ -56,7 +56,7 @@ RUN apk update && apk add --no-cache && \ git clone --depth 1 --single-branch --branch main --recursive https://github.com/microsoft/msquic && \ cd msquic && \ cmake -B build/linux/arm64_openssl3 \ - -DQUIC_OUTPUT_DIR=/tmp/msquic/src/msquic/artifacts/bin/linux/arm64_Release_openssl3 \ + -DQUIC_OUTPUT_DIR=/tmp/msquic/artifacts/bin/linux/arm64_Release_openssl3 \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_TARGET_ARCHITECTURE=arm64 \ -DQUIC_TLS=openssl3 \