From: Neil Horman <nhorman@openssl.org>
Date: Fri, 30 Aug 2024 16:48:33 +0000 (-0400)
Subject: update quic docker container files
X-Git-Tag: openssl-3.5.0-alpha1~1123
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=39517412248f5b8dab8b27c707b247c590e7b74e;p=thirdparty%2Fopenssl.git

update quic docker container files

1) Limit clone depth to allow faster fetches
2) Supply OPENSSL_URL and OPENSSL_BRANCH args to allow for branch
   testing

Reviewed-by: Sasa Nedvedicky <sashan@openssl.org>
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/25426)
---

diff --git a/test/quic-openssl-docker/Dockerfile b/test/quic-openssl-docker/Dockerfile
index 85bb63a38d4..5a65cbf2823 100644
--- a/test/quic-openssl-docker/Dockerfile
+++ b/test/quic-openssl-docker/Dockerfile
@@ -4,6 +4,9 @@ FROM martenseemann/quic-network-simulator-endpoint:latest
 ENV PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/lib/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig/:$PKG_CONFIG_LIBDIR
 # Set the environment variable LD_LIBRARY_PATH to ensure we get the right libraries
 ENV LD_LIBRARY_PATH=/usr/lib64:/usr/lib:/usr/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH
+# The branch of openssl to clone
+ARG OPENSSL_URL=https://github.com/openssl/openssl.git
+ARG OPENSSL_BRANCH=master
 
 # Install needed tools
 RUN apt-get update && apt-get install -y \
@@ -13,7 +16,7 @@ RUN apt-get update && apt-get install -y \
 WORKDIR /
 
 # build nghttp3
-RUN git clone https://github.com/ngtcp2/nghttp3.git && \
+RUN git clone --depth 1 https://github.com/ngtcp2/nghttp3.git && \
     cd nghttp3 && \
     git submodule update --init && \
     autoreconf -i && \
@@ -23,14 +26,14 @@ RUN git clone https://github.com/ngtcp2/nghttp3.git && \
     rm -rf /nghttp3
 
 # download and build openssl 
-RUN git clone https://github.com/openssl/openssl.git && \
+RUN git clone --depth 1 -b $OPENSSL_BRANCH $OPENSSL_URL && \
     cd openssl && \
-    ./Configure enable-fips enable-demos no-docs --prefix=/usr --openssldir=/etc/pki/tls && \
+    ./Configure enable-fips enable-demos disable-docs --prefix=/usr --openssldir=/etc/pki/tls && \
     make -j 4 && make install && cp demos/guide/quic-hq-interop /usr/local/bin && \
     rm -rf /openssl
 
 # Build curl
-RUN git clone https://github.com/curl/curl.git && \
+RUN git clone --depth 1 https://github.com/curl/curl.git && \
     cd curl && \
     autoreconf -fi && ./configure --with-openssl-quic --with-openssl --with-nghttp3 --prefix=/usr && \
     make -j 4 && \