Skip to content

Commit 1f7e3c6

Browse files
committed
Update mainline to 1.11.3.
1 parent 43c1121 commit 1f7e3c6

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

mainline/alpine/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM alpine:3.4
22

33
MAINTAINER NGINX Docker Maintainers "docker-maint@nginx.com"
44

5-
ENV NGINX_VERSION 1.11.2
5+
ENV NGINX_VERSION 1.11.3
66

77
RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
88
&& CONFIG="\
@@ -41,6 +41,7 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
4141
--with-threads \
4242
--with-stream \
4343
--with-stream_ssl_module \
44+
--with-stream_geoip_module=dynamic \
4445
--with-http_slice_module \
4546
--with-mail \
4647
--with-mail_ssl_module \
@@ -81,6 +82,7 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
8182
&& mv objs/ngx_http_image_filter_module.so objs/ngx_http_image_filter_module-debug.so \
8283
&& mv objs/ngx_http_geoip_module.so objs/ngx_http_geoip_module-debug.so \
8384
&& mv objs/ngx_http_perl_module.so objs/ngx_http_perl_module-debug.so \
85+
&& mv objs/ngx_stream_geoip_module.so objs/ngx_stream_geoip_module-debug.so \
8486
&& ./configure $CONFIG \
8587
&& make \
8688
&& make install \
@@ -94,6 +96,7 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
9496
&& install -m755 objs/ngx_http_image_filter_module-debug.so /usr/lib/nginx/modules/ngx_http_image_filter_module-debug.so \
9597
&& install -m755 objs/ngx_http_geoip_module-debug.so /usr/lib/nginx/modules/ngx_http_geoip_module-debug.so \
9698
&& install -m755 objs/ngx_http_perl_module-debug.so /usr/lib/nginx/modules/ngx_http_perl_module-debug.so \
99+
&& install -m755 objs/ngx_stream_geoip_module-debug.so /usr/lib/nginx/modules/ngx_stream_geoip_module-debug.so \
97100
&& ln -s ../../usr/lib/nginx/modules /etc/nginx/modules \
98101
&& strip /usr/sbin/nginx* \
99102
&& strip /usr/lib/nginx/modules/*.so \

mainline/jessie/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM debian:jessie
22

33
MAINTAINER NGINX Docker Maintainers "docker-maint@nginx.com"
44

5-
ENV NGINX_VERSION 1.11.2-1~jessie
5+
ENV NGINX_VERSION 1.11.3-1~jessie
66

77
RUN apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys 573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62 \
88
&& echo "deb http://nginx.org/packages/mainline/debian/ jessie nginx" >> /etc/apt/sources.list \

0 commit comments

Comments
 (0)