Fix building with dockerfiles (#1)

* Add ech to Dockerfile.template * Add ech to chrome Dockerfile * Add ech to firefox dockerfile * Add ech to ff alpine Dockerfile * Added ech to chrome alpine Dockerfile
lexiforest · Dec 10, 2023 · 40017cc · 40017cc
1 parent babcd10
commit 40017cc
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 0 deletions.
diff --git a/Dockerfile.template b/Dockerfile.template
@@ -156,6 +156,8 @@ RUN cd ${CURL_VERSION} && \
 {{#firefox}}
                 --with-nss=/build/${NSS_VERSION}/dist/Release \
                 --with-nss-deprecated \
+                --without-zstd \
+                --enable-ech \
                 CFLAGS="-I/build/${NSS_VERSION}/dist/public/nss -I/build/${NSS_VERSION}/dist/Release/include/nspr" \
 {{/firefox}}
 {{#chrome}}
@@ -196,6 +198,8 @@ RUN cd ${CURL_VERSION} && \
 {{#firefox}}
                 --with-nss=/build/${NSS_VERSION}/dist/Release \
                 --with-nss-deprecated \
+                --without-zstd \
+                --enable-ech \
                 CFLAGS="-I/build/${NSS_VERSION}/dist/public/nss -I/build/${NSS_VERSION}/dist/Release/include/nspr" \
 {{/firefox}}
 {{#chrome}}

diff --git a/chrome/Dockerfile b/chrome/Dockerfile
@@ -95,6 +95,8 @@ RUN cd ${CURL_VERSION} && \
                 --with-nghttp2=/build/${NGHTTP2_VERSION}/installed \
                 --with-brotli=/build/brotli-${BROTLI_VERSION}/build/installed \
                 --with-openssl=/build/boringssl/build \
+                --without-zstd \
+                --enable-ech \
                 LIBS="-pthread" \
                 CFLAGS="-I/build/boringssl/build" \
                 USE_CURL_SSLKEYLOGFILE=true && \
@@ -122,6 +124,8 @@ RUN cd ${CURL_VERSION} && \
                 --with-nghttp2=/build/${NGHTTP2_VERSION}/installed \
                 --with-brotli=/build/brotli-${BROTLI_VERSION}/build/installed \
                 --with-openssl=/build/boringssl/build \
+                --without-zstd \
+                --enable-ech \
                 LIBS="-pthread" \
                 CFLAGS="-I/build/boringssl/build" \
                 USE_CURL_SSLKEYLOGFILE=true && \

diff --git a/chrome/Dockerfile.alpine b/chrome/Dockerfile.alpine
@@ -88,6 +88,8 @@ RUN cd ${CURL_VERSION} && \
                 --with-nghttp2=/build/${NGHTTP2_VERSION}/installed \
                 --with-brotli=/build/brotli-${BROTLI_VERSION}/build/installed \
                 --with-openssl=/build/boringssl/build \
+                --without-zstd \
+                --enable-ech \
                 LIBS="-pthread" \
                 CFLAGS="-I/build/boringssl/build" \
                 USE_CURL_SSLKEYLOGFILE=true && \
@@ -115,6 +117,8 @@ RUN cd ${CURL_VERSION} && \
                 --with-nghttp2=/build/${NGHTTP2_VERSION}/installed \
                 --with-brotli=/build/brotli-${BROTLI_VERSION}/build/installed \
                 --with-openssl=/build/boringssl/build \
+                --without-zstd \
+                --enable-ech \
                 LIBS="-pthread" \
                 CFLAGS="-I/build/boringssl/build" \
                 USE_CURL_SSLKEYLOGFILE=true && \

diff --git a/firefox/Dockerfile b/firefox/Dockerfile
@@ -90,6 +90,8 @@ RUN cd ${CURL_VERSION} && \
                 --with-brotli=/build/brotli-${BROTLI_VERSION}/build/installed \
                 --with-nss=/build/${NSS_VERSION}/dist/Release \
                 --with-nss-deprecated \
+                --without-zstd \
+                --enable-ech \
                 CFLAGS="-I/build/${NSS_VERSION}/dist/public/nss -I/build/${NSS_VERSION}/dist/Release/include/nspr" \
                 USE_CURL_SSLKEYLOGFILE=true && \
     make && make install
@@ -117,6 +119,8 @@ RUN cd ${CURL_VERSION} && \
                 --with-brotli=/build/brotli-${BROTLI_VERSION}/build/installed \
                 --with-nss=/build/${NSS_VERSION}/dist/Release \
                 --with-nss-deprecated \
+                --without-zstd \
+                --enable-ech \
                 CFLAGS="-I/build/${NSS_VERSION}/dist/public/nss -I/build/${NSS_VERSION}/dist/Release/include/nspr" \
                 USE_CURL_SSLKEYLOGFILE=true && \
     make clean && make && make install

diff --git a/firefox/Dockerfile.alpine b/firefox/Dockerfile.alpine
@@ -79,6 +79,8 @@ RUN cd ${CURL_VERSION} && \
                 --with-brotli=/build/brotli-${BROTLI_VERSION}/build/installed \
                 --with-nss=/build/${NSS_VERSION}/dist/Release \
                 --with-nss-deprecated \
+                --without-zstd \
+                --enable-ech \
                 CFLAGS="-I/build/${NSS_VERSION}/dist/public/nss -I/build/${NSS_VERSION}/dist/Release/include/nspr" \
                 USE_CURL_SSLKEYLOGFILE=true && \
     make && make install
@@ -106,6 +108,8 @@ RUN cd ${CURL_VERSION} && \
                 --with-brotli=/build/brotli-${BROTLI_VERSION}/build/installed \
                 --with-nss=/build/${NSS_VERSION}/dist/Release \
                 --with-nss-deprecated \
+                --without-zstd \
+                --enable-ech \
                 CFLAGS="-I/build/${NSS_VERSION}/dist/public/nss -I/build/${NSS_VERSION}/dist/Release/include/nspr" \
                 USE_CURL_SSLKEYLOGFILE=true && \
     make clean && make && make install