Skip to content

Commit f599d6a

Browse files
authored
Bump nginx to v1.21.4 (#27)
1 parent 521f2e4 commit f599d6a

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

Dockerfile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
FROM alpine:3.14 AS build
22

3-
ENV NGINX_VERSION 1.21.3
3+
ENV NGINX_VERSION 1.21.4
44
# https://github.com/nginx/njs
5-
ENV NJS_MODULE_VERSION 0.6.2
5+
ENV NJS_MODULE_VERSION 0.7.0
66
# https://github.com/openresty/echo-nginx-module
77
ENV ECHO_MODULE_VERSION v0.62
88
# https://github.com/openresty/headers-more-nginx-module
@@ -27,11 +27,11 @@ ENV UPSYNC_MODULE_VERSION v2.1.3
2727
# https://github.com/xiaokai-wang/nginx-stream-upsync-module
2828
ENV UPSYNC_STREAM_MODULE_VERSION v1.2.2
2929
# https://github.com/jaegertracing/jaeger-client-cpp
30-
ENV JAEGER_CLIENT_VERSION v0.7.0
30+
ENV JAEGER_CLIENT_VERSION v0.8.0
3131
# https://github.com/opentracing/opentracing-cpp
3232
ENV OPENTRACING_LIB_VERSION v1.6.0
3333
# https://github.com/opentracing-contrib/nginx-opentracing
34-
ENV OPENTRACING_MODULE_VERSION v0.20.0
34+
ENV OPENTRACING_MODULE_VERSION v0.21.0
3535

3636
COPY *.patch /tmp/
3737
RUN set -eux \
@@ -157,8 +157,7 @@ RUN set -eux \
157157
&& tar -zxC /usr/src/nginx-${NGINX_VERSION}/ngx_http_redis -f ngx_http_redis.tar.gz --strip 1 \
158158
\
159159
# A forward proxy module for CONNECT request handling
160-
# && git clone --depth=1 https://github.com/chobits/ngx_http_proxy_connect_module.git \
161-
&& git clone --depth=1 --single-branch -b p102101 https://github.com/levonet/ngx_http_proxy_connect_module.git \
160+
&& git clone --depth=1 https://github.com/chobits/ngx_http_proxy_connect_module.git \
162161
&& patch -p1 < ngx_http_proxy_connect_module/patch/proxy_connect_rewrite_102101.patch \
163162
\
164163
# Sync upstreams from consul or others

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Supported tags and respective `Dockerfile` links
22

33
- [`latest` (*Dockerfile*)](https://github.com/levonet/docker-nginx/blob/master/Dockerfile)
4-
- [`1.21.3-alpine`, `1.21-alpine` (*Dockerfile*)](https://github.com/levonet/docker-nginx/blob/v1.21.3/Dockerfile) Mainline version
4+
- [`1.21.4-alpine`, `1.21-alpine` (*Dockerfile*)](https://github.com/levonet/docker-nginx/blob/v1.21.4/Dockerfile) Mainline version
55
- [`1.20.1-alpine`, `1.20-alpine` (*Dockerfile*)](https://github.com/levonet/docker-nginx/blob/v1.20.1/Dockerfile) Stable version
66
- <details><summary>Older versions</summary>
77

0 commit comments

Comments
 (0)