Only enable ech for Chrome

lexiforest · Jan 4, 2024 · f581165 · f581165
1 parent 081600d
commit f581165
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/Dockerfile.template b/Dockerfile.template
@@ -151,7 +151,6 @@ RUN cd ${CURL_VERSION} && \
                 --enable-static \
                 --disable-shared \
                 --enable-websockets \
-                --enable-ech \
                 --with-nghttp2=/build/${NGHTTP2_VERSION}/installed \
                 --with-brotli=/build/brotli-${BROTLI_VERSION}/build/installed \
                 --without-zstd \
@@ -161,6 +160,7 @@ RUN cd ${CURL_VERSION} && \
                 CFLAGS="-I/build/${NSS_VERSION}/dist/public/nss -I/build/${NSS_VERSION}/dist/Release/include/nspr" \
 {{/firefox}}
 {{#chrome}}
+                --enable-ech \
                 --with-openssl=/build/boringssl/build \
                 LIBS="-pthread" \
                 CFLAGS="-I/build/boringssl/build" \
@@ -193,7 +193,6 @@ RUN rm -Rf /build/install
 # Re-compile libcurl dynamically
 RUN cd ${CURL_VERSION} && \
     ./configure --prefix=/build/install \
-                --enable-ech \
                 --with-nghttp2=/build/${NGHTTP2_VERSION}/installed \
                 --with-brotli=/build/brotli-${BROTLI_VERSION}/build/installed \
                 --without-zstd \
@@ -203,6 +202,7 @@ RUN cd ${CURL_VERSION} && \
                 CFLAGS="-I/build/${NSS_VERSION}/dist/public/nss -I/build/${NSS_VERSION}/dist/Release/include/nspr" \
 {{/firefox}}
 {{#chrome}}
+                --enable-ech \
                 --with-openssl=/build/boringssl/build \
                 LIBS="-pthread" \
                 CFLAGS="-I/build/boringssl/build" \

diff --git a/chrome/Dockerfile b/chrome/Dockerfile
@@ -92,10 +92,10 @@ RUN cd ${CURL_VERSION} && \
                 --enable-static \
                 --disable-shared \
                 --enable-websockets \
-                --enable-ech \
                 --with-nghttp2=/build/${NGHTTP2_VERSION}/installed \
                 --with-brotli=/build/brotli-${BROTLI_VERSION}/build/installed \
                 --without-zstd \
+                --enable-ech \
                 --with-openssl=/build/boringssl/build \
                 LIBS="-pthread" \
                 CFLAGS="-I/build/boringssl/build" \
@@ -121,10 +121,10 @@ RUN rm -Rf /build/install
 # Re-compile libcurl dynamically
 RUN cd ${CURL_VERSION} && \
     ./configure --prefix=/build/install \
-                --enable-ech \
                 --with-nghttp2=/build/${NGHTTP2_VERSION}/installed \
                 --with-brotli=/build/brotli-${BROTLI_VERSION}/build/installed \
                 --without-zstd \
+                --enable-ech \
                 --with-openssl=/build/boringssl/build \
                 LIBS="-pthread" \
                 CFLAGS="-I/build/boringssl/build" \

diff --git a/chrome/Dockerfile.alpine b/chrome/Dockerfile.alpine
@@ -85,10 +85,10 @@ RUN cd ${CURL_VERSION} && \
                 --enable-static \
                 --disable-shared \
                 --enable-websockets \
-                --enable-ech \
                 --with-nghttp2=/build/${NGHTTP2_VERSION}/installed \
                 --with-brotli=/build/brotli-${BROTLI_VERSION}/build/installed \
                 --without-zstd \
+                --enable-ech \
                 --with-openssl=/build/boringssl/build \
                 LIBS="-pthread" \
                 CFLAGS="-I/build/boringssl/build" \
@@ -114,10 +114,10 @@ RUN rm -Rf /build/install
 # Re-compile libcurl dynamically
 RUN cd ${CURL_VERSION} && \
     ./configure --prefix=/build/install \
-                --enable-ech \
                 --with-nghttp2=/build/${NGHTTP2_VERSION}/installed \
                 --with-brotli=/build/brotli-${BROTLI_VERSION}/build/installed \
                 --without-zstd \
+                --enable-ech \
                 --with-openssl=/build/boringssl/build \
                 LIBS="-pthread" \
                 CFLAGS="-I/build/boringssl/build" \

diff --git a/firefox/Dockerfile b/firefox/Dockerfile
@@ -86,7 +86,6 @@ RUN cd ${CURL_VERSION} && \
                 --enable-static \
                 --disable-shared \
                 --enable-websockets \
-                --enable-ech \
                 --with-nghttp2=/build/${NGHTTP2_VERSION}/installed \
                 --with-brotli=/build/brotli-${BROTLI_VERSION}/build/installed \
                 --without-zstd \
@@ -115,7 +114,6 @@ RUN rm -Rf /build/install
 # Re-compile libcurl dynamically
 RUN cd ${CURL_VERSION} && \
     ./configure --prefix=/build/install \
-                --enable-ech \
                 --with-nghttp2=/build/${NGHTTP2_VERSION}/installed \
                 --with-brotli=/build/brotli-${BROTLI_VERSION}/build/installed \
                 --without-zstd \

diff --git a/firefox/Dockerfile.alpine b/firefox/Dockerfile.alpine
@@ -75,7 +75,6 @@ RUN cd ${CURL_VERSION} && \
                 --enable-static \
                 --disable-shared \
                 --enable-websockets \
-                --enable-ech \
                 --with-nghttp2=/build/${NGHTTP2_VERSION}/installed \
                 --with-brotli=/build/brotli-${BROTLI_VERSION}/build/installed \
                 --without-zstd \
@@ -104,7 +103,6 @@ RUN rm -Rf /build/install
 # Re-compile libcurl dynamically
 RUN cd ${CURL_VERSION} && \
     ./configure --prefix=/build/install \
-                --enable-ech \
                 --with-nghttp2=/build/${NGHTTP2_VERSION}/installed \
                 --with-brotli=/build/brotli-${BROTLI_VERSION}/build/installed \
                 --without-zstd \