Skip to content

Commit d772660

Browse files
authored
update: nginx, openssl and libmaxmind versions
1 parent 84b4de6 commit d772660

File tree

2 files changed

+9
-22
lines changed

2 files changed

+9
-22
lines changed

Dockerfile

+6-19
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@ FROM gokaygurcan/ubuntu:latest
55
# metadata
66
LABEL maintainer "Gökay Gürcan <[email protected]>"
77

8-
ENV DEBIAN_FRONTEND="noninteractive" \
9-
USR_SRC=/usr/src \
8+
ARG DEBIAN_FRONTEND=noninteractive
9+
ENV USR_SRC=/usr/src \
1010
USR_SRC_NGINX=/usr/src/nginx \
1111
USR_SRC_NGINX_MODS=/usr/src/nginx/modules \
12-
NGINX_VERSION=1.25.3 \
13-
OPENSSL_VERSION=1.1.1w \
14-
# PAGESPEED_VERSION=1.13.35.2 \
15-
LIBMAXMINDDB_VERSION=1.8.0
12+
NGINX_VERSION=1.27.0 \
13+
OPENSSL_VERSION=3.3.1 \
14+
LIBMAXMINDDB_VERSION=1.10.0
1615

1716
USER root
1817

@@ -109,17 +108,6 @@ RUN set -ex && \
109108
tar -xzf aperezdc-ngx-fancyindex-*.tar.gz && \
110109
rm aperezdc-ngx-fancyindex-*.tar.gz && \
111110
mv aperezdc-ngx-fancyindex-* fancyindex
112-
# && \
113-
# apache/incubator-pagespeed-ngx and psol
114-
# wget -q https://github.com/apache/incubator-pagespeed-ngx/archive/v${PAGESPEED_VERSION}-stable.tar.gz && \
115-
# tar -xzf v${PAGESPEED_VERSION}-stable.tar.gz && \
116-
# rm v${PAGESPEED_VERSION}-stable.tar.gz && \
117-
# mv *-pagespeed-* pagespeed && \
118-
# cd ${USR_SRC_NGINX_MODS}/pagespeed && \
119-
# wget -q https://dl.google.com/dl/page-speed/psol/${PAGESPEED_VERSION}-x64.tar.gz && \
120-
# tar -xzf ${PAGESPEED_VERSION}-x64.tar.gz && \
121-
# rm ${PAGESPEED_VERSION}-x64.tar.gz && \
122-
# mkdir -p /var/cache/ngx_pagespeed
123111

124112
# compile nginx
125113
RUN cd ${USR_SRC_NGINX} && \
@@ -160,7 +148,6 @@ RUN cd ${USR_SRC_NGINX} && \
160148
--without-http_uwsgi_module \
161149
--without-http_scgi_module \
162150
--add-module=${USR_SRC_NGINX_MODS}/njs/nginx \
163-
# --add-module=${USR_SRC_NGINX_MODS}/pagespeed \
164151
--add-module=${USR_SRC_NGINX_MODS}/geoip2 \
165152
--add-module=${USR_SRC_NGINX_MODS}/headers-more \
166153
--add-module=${USR_SRC_NGINX_MODS}/cache-purge \
@@ -201,6 +188,6 @@ STOPSIGNAL SIGTERM
201188

202189
USER ubuntu
203190

204-
HEALTHCHECK CMD curl -f http://localhost/ || exit 1
191+
HEALTHCHECK --interval=60s --start-period=60s CMD curl -f http://localhost/ || exit 1
205192

206193
CMD [ "sudo", "nginx", "-g", "daemon off;" ]

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
| Variable | Version |
1212
| -------------------- | ---------------------- |
13-
| NGINX_VERSION | 1.22.0 |
14-
| OPENSSL_VERSION | 1.1.1p |
15-
| LIBMAXMINDDB_VERSION | 1.6.0 |
13+
| NGINX_VERSION | 1.27.0 |
14+
| OPENSSL_VERSION | 3.3.1 |
15+
| LIBMAXMINDDB_VERSION | 1.10.0 |
1616

1717
## Additional packages
1818

0 commit comments

Comments
 (0)