Skip to content

Commit aca1039

Browse files
committed
Dockerfile: fixed build with current boringssl and nginx
1 parent 2dfa34f commit aca1039

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM martenseemann/quic-network-simulator-endpoint:latest AS builder
22

33
ARG DEBIAN_FRONTEND=noninteractive
44
RUN apt-get update
5-
RUN apt-get install -qy mercurial build-essential libpcre3 libpcre3-dev zlib1g zlib1g-dev curl git cmake ninja-build gnutls-bin iptables
5+
RUN apt-get install -qy build-essential libpcre3 libpcre3-dev zlib1g zlib1g-dev curl git cmake ninja-build gnutls-bin iptables
66

77
RUN useradd nginx
88

@@ -18,18 +18,18 @@ RUN cd boringssl && \
1818
ninja && \
1919
cd ../.. && \
2020
mkdir -p boringssl/.openssl/lib && \
21-
cp boringssl/build/crypto/libcrypto.a boringssl/build/ssl/libssl.a boringssl/.openssl/lib && \
21+
cp boringssl/build/libcrypto.a boringssl/build/libssl.a boringssl/.openssl/lib && \
2222
cd boringssl/.openssl && \
2323
ln -s ../include . && \
2424
cd ../..
2525

2626
RUN touch 'boringssl/.openssl/include/openssl/ssl.h'
2727

28-
RUN hg clone http://hg.nginx.org/nginx
28+
RUN git clone https://github.com/nginx/nginx
2929

3030
RUN cd nginx && \
3131
./auto/configure --prefix=/etc/nginx \
32-
--build=$(hg tip | head -n 1 | awk '{ print $2 }') \
32+
--build=$(git rev-parse HEAD) \
3333
--sbin-path=/usr/sbin/nginx \
3434
--modules-path=/usr/lib/nginx/modules \
3535
--conf-path=/etc/nginx/nginx.conf \
@@ -50,8 +50,8 @@ RUN cd nginx && \
5050
--with-http_v2_module \
5151
--with-http_v3_module \
5252
--with-cc=c++ \
53-
--with-cc-opt='-I/boringssl/include -O0 -fno-common -fno-omit-frame-pointer -DNGX_QUIC_DRAFT_VERSION=29 -DNGX_HTTP_V3_HQ=1 -x c' \
54-
--with-ld-opt='-L/boringssl/build/ssl -L/boringssl/build/crypto'
53+
--with-cc-opt='-I/boringssl/include -O0 -fno-common -fno-omit-frame-pointer -x c' \
54+
--with-ld-opt='-L/boringssl/build'
5555

5656
RUN cd nginx && make -j$(nproc)
5757
RUN cd nginx && make install

0 commit comments

Comments
 (0)