Add git to dockerfile

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

Hide file tree

Showing 6 changed files with 22 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@ build/
 **/__pycache__
 config.log
 config.status
+.DS_Store
diff --git a/Dockerfile.template b/Dockerfile.template
@@ -28,7 +28,7 @@ RUN apk add git bash build-base make cmake ninja curl zlib-dev patch linux-heade
 # The following are needed because we are going to change some autoconf scripts,
 # both for libnghttp2 and curl.
 {{#debian}}
-RUN apt-get install -y autoconf automake autotools-dev pkg-config libtool
+RUN apt-get install -y autoconf automake autotools-dev pkg-config libtool git
 {{/debian}}
 {{#alpine}}
 RUN apk add autoconf automake pkgconfig libtool
@@ -151,6 +151,7 @@ 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 \
@@ -192,6 +193,7 @@ 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/chrome/Dockerfile b/chrome/Dockerfile
@@ -17,7 +17,7 @@ RUN apt-get update && \
 
 # The following are needed because we are going to change some autoconf scripts,
 # both for libnghttp2 and curl.
-RUN apt-get install -y autoconf automake autotools-dev pkg-config libtool
+RUN apt-get install -y autoconf automake autotools-dev pkg-config libtool git
 
 # Dependencies for downloading and building nghttp2
 RUN apt-get install -y bzip2
@@ -92,11 +92,11 @@ 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 \
-                --with-openssl=/build/boringssl/build \
                 --without-zstd \
-                --enable-ech \
+                --with-openssl=/build/boringssl/build \
                 LIBS="-pthread" \
                 CFLAGS="-I/build/boringssl/build" \
                 USE_CURL_SSLKEYLOGFILE=true && \
@@ -121,11 +121,11 @@ 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 \
-                --with-openssl=/build/boringssl/build \
                 --without-zstd \
-                --enable-ech \
+                --with-openssl=/build/boringssl/build \
                 LIBS="-pthread" \
                 CFLAGS="-I/build/boringssl/build" \
                 USE_CURL_SSLKEYLOGFILE=true && \

diff --git a/chrome/Dockerfile.alpine b/chrome/Dockerfile.alpine
@@ -85,11 +85,11 @@ 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 \
-                --with-openssl=/build/boringssl/build \
                 --without-zstd \
-                --enable-ech \
+                --with-openssl=/build/boringssl/build \
                 LIBS="-pthread" \
                 CFLAGS="-I/build/boringssl/build" \
                 USE_CURL_SSLKEYLOGFILE=true && \
@@ -114,11 +114,11 @@ 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 \
-                --with-openssl=/build/boringssl/build \
                 --without-zstd \
-                --enable-ech \
+                --with-openssl=/build/boringssl/build \
                 LIBS="-pthread" \
                 CFLAGS="-I/build/boringssl/build" \
                 USE_CURL_SSLKEYLOGFILE=true && \

diff --git a/firefox/Dockerfile b/firefox/Dockerfile
@@ -17,7 +17,7 @@ RUN apt-get update && \
 
 # The following are needed because we are going to change some autoconf scripts,
 # both for libnghttp2 and curl.
-RUN apt-get install -y autoconf automake autotools-dev pkg-config libtool
+RUN apt-get install -y autoconf automake autotools-dev pkg-config libtool git
 
 # Dependencies for downloading and building nghttp2
 RUN apt-get install -y bzip2
@@ -86,11 +86,12 @@ 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 \
                 --with-nss=/build/${NSS_VERSION}/dist/Release \
                 --with-nss-deprecated \
-                --without-zstd \
                 CFLAGS="-I/build/${NSS_VERSION}/dist/public/nss -I/build/${NSS_VERSION}/dist/Release/include/nspr" \
                 USE_CURL_SSLKEYLOGFILE=true && \
     make && make install
@@ -114,11 +115,12 @@ 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 \
                 --with-nss=/build/${NSS_VERSION}/dist/Release \
                 --with-nss-deprecated \
-                --without-zstd \
                 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
@@ -75,11 +75,12 @@ 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 \
                 --with-nss=/build/${NSS_VERSION}/dist/Release \
                 --with-nss-deprecated \
-                --without-zstd \
                 CFLAGS="-I/build/${NSS_VERSION}/dist/public/nss -I/build/${NSS_VERSION}/dist/Release/include/nspr" \
                 USE_CURL_SSLKEYLOGFILE=true && \
     make && make install
@@ -103,11 +104,12 @@ 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 \
                 --with-nss=/build/${NSS_VERSION}/dist/Release \
                 --with-nss-deprecated \
-                --without-zstd \
                 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