Skip to content

Commit f3931d8

Browse files
committed
Use OpenSSL instead of boringssl + use Alpine 3.19
1 parent 6b365cf commit f3931d8

File tree

1 file changed

+18
-21
lines changed

1 file changed

+18
-21
lines changed

Dockerfile

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ARG NGINX_COMMIT=25a2efd97a3e
88
ARG NGX_BROTLI_COMMIT=63ca02abdcf79c9e788d2eedcc388d2335902e52
99

1010
# https://github.com/google/boringssl
11-
ARG BORINGSSL_COMMIT=e1b8685770d0e82e5a4a3c5d24ad1602e05f2e83
11+
#ARG BORINGSSL_COMMIT=fae0964b3d44e94ca2a2d21f86e61dabe683d130
1212

1313
# http://hg.nginx.org/njs / v0.8.1
1414
ARG NJS_COMMIT=a387eed79b90
@@ -26,7 +26,7 @@ ARG NGINX_GROUP_GID=101
2626

2727
# https://nginx.org/en/docs/http/ngx_http_v3_module.html
2828
ARG CONFIG="\
29-
--build=quic-$NGINX_COMMIT-boringssl-$BORINGSSL_COMMIT \
29+
--build=quic-$NGINX_COMMIT \
3030
--prefix=/etc/nginx \
3131
--sbin-path=/usr/sbin/nginx \
3232
--modules-path=/usr/lib/nginx/modules \
@@ -78,7 +78,7 @@ ARG CONFIG="\
7878
--add-dynamic-module=/usr/src/ngx_http_geoip2_module \
7979
"
8080

81-
FROM alpine:3.17 AS base
81+
FROM alpine:3.19 AS base
8282

8383
ARG NGINX_VERSION
8484
ARG NGINX_COMMIT
@@ -137,20 +137,20 @@ RUN \
137137
&& git submodule update --init --depth 1
138138

139139
# hadolint ignore=SC2086
140-
RUN \
141-
echo "Cloning boringssl ..." \
142-
&& cd /usr/src \
143-
&& git clone https://github.com/google/boringssl \
144-
&& cd boringssl \
145-
&& git checkout $BORINGSSL_COMMIT
146-
147-
RUN \
148-
echo "Building boringssl ..." \
149-
&& cd /usr/src/boringssl \
150-
&& mkdir build \
151-
&& cd build \
152-
&& cmake -GNinja .. \
153-
&& ninja
140+
#RUN \
141+
# echo "Cloning boringssl ..." \
142+
# && cd /usr/src \
143+
# && git clone https://github.com/google/boringssl \
144+
# && cd boringssl \
145+
# && git checkout $BORINGSSL_COMMIT
146+
147+
#RUN \
148+
# echo "Building boringssl ..." \
149+
# && cd /usr/src/boringssl \
150+
# && mkdir build \
151+
# && cd build \
152+
# && cmake -GNinja .. \
153+
# && ninja
154154

155155
RUN \
156156
echo "Downloading headers-more-nginx-module ..." \
@@ -177,9 +177,6 @@ RUN \
177177
&& mkdir -p /var/run/nginx/ \
178178
&& cd /usr/src/nginx-$NGINX_VERSION \
179179
&& ./auto/configure $CONFIG \
180-
--with-cc-opt="-I../boringssl/include" \
181-
--with-ld-opt="-L../boringssl/build/ssl \
182-
-L../boringssl/build/crypto" \
183180
&& make -j"$(getconf _NPROCESSORS_ONLN)"
184181

185182
RUN \
@@ -206,7 +203,7 @@ RUN \
206203
| xargs -r apk info --installed \
207204
| sort -u > /tmp/runDeps.txt
208205

209-
FROM alpine:3.17
206+
FROM alpine:3.19
210207
ARG NGINX_VERSION
211208
ARG NGINX_COMMIT
212209
ARG NGINX_USER_UID

0 commit comments

Comments
 (0)