Skip to content

Commit 847416e

Browse files
committed
1.10.0 released.
1 parent 19799fa commit 847416e

File tree

2 files changed

+35
-5
lines changed

2 files changed

+35
-5
lines changed

stable/alpine/Dockerfile

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@ FROM alpine:3.3
22

33
MAINTAINER NGINX Docker Maintainers "[email protected]"
44

5-
ENV NGINX_VERSION 1.8.1
5+
ENV NGINX_VERSION 1.10.0
66

77
ENV GPG_KEYS B0F4253373F8F6F510D42178520A9993A1C052F8
88
ENV CONFIG "\
99
--prefix=/etc/nginx \
1010
--sbin-path=/usr/sbin/nginx \
11+
--modules-path=/usr/lib/nginx/modules \
1112
--conf-path=/etc/nginx/nginx.conf \
1213
--error-log-path=/var/log/nginx/error.log \
1314
--http-log-path=/var/log/nginx/access.log \
@@ -33,10 +34,18 @@ ENV CONFIG "\
3334
--with-http_secure_link_module \
3435
--with-http_stub_status_module \
3536
--with-http_auth_request_module \
37+
--with-http_xslt_module=dynamic \
38+
--with-http_image_filter_module=dynamic \
39+
--with-http_geoip_module=dynamic \
40+
--with-http_perl_module=dynamic \
41+
--with-threads \
42+
--with-stream \
43+
--with-stream_ssl_module \
44+
--with-http_slice_module \
3645
--with-mail \
3746
--with-mail_ssl_module \
3847
--with-file-aio \
39-
--with-http_spdy_module \
48+
--with-http_v2_module \
4049
--with-ipv6 \
4150
"
4251

@@ -53,6 +62,10 @@ RUN \
5362
linux-headers \
5463
curl \
5564
gnupg \
65+
libxslt-dev \
66+
gd-dev \
67+
geoip-dev \
68+
perl-dev \
5669
&& curl -fSL http://nginx.org/download/nginx-$NGINX_VERSION.tar.gz -o nginx.tar.gz \
5770
&& curl -fSL http://nginx.org/download/nginx-$NGINX_VERSION.tar.gz.asc -o nginx.tar.gz.asc \
5871
&& export GNUPGHOME="$(mktemp -d)" \
@@ -66,6 +79,10 @@ RUN \
6679
&& ./configure $CONFIG --with-debug \
6780
&& make \
6881
&& mv objs/nginx objs/nginx-debug \
82+
&& mv objs/ngx_http_xslt_filter_module.so objs/ngx_http_xslt_filter_module-debug.so \
83+
&& mv objs/ngx_http_image_filter_module.so objs/ngx_http_image_filter_module-debug.so \
84+
&& mv objs/ngx_http_geoip_module.so objs/ngx_http_geoip_module-debug.so \
85+
&& mv objs/ngx_http_perl_module.so objs/ngx_http_perl_module-debug.so \
6986
&& ./configure $CONFIG \
7087
&& make \
7188
&& make install \
@@ -75,9 +92,15 @@ RUN \
7592
&& install -m644 html/index.html /usr/share/nginx/html/ \
7693
&& install -m644 html/50x.html /usr/share/nginx/html/ \
7794
&& install -m755 objs/nginx-debug /usr/sbin/nginx-debug \
95+
&& install -m755 objs/ngx_http_xslt_filter_module-debug.so /usr/lib/nginx/modules/ngx_http_xslt_filter_module-debug.so \
96+
&& install -m755 objs/ngx_http_image_filter_module-debug.so /usr/lib/nginx/modules/ngx_http_image_filter_module-debug.so \
97+
&& install -m755 objs/ngx_http_geoip_module-debug.so /usr/lib/nginx/modules/ngx_http_geoip_module-debug.so \
98+
&& install -m755 objs/ngx_http_perl_module-debug.so /usr/lib/nginx/modules/ngx_http_perl_module-debug.so \
99+
&& ln -s ../../usr/lib/nginx/modules /etc/nginx/modules \
78100
&& strip /usr/sbin/nginx* \
101+
&& strip /usr/lib/nginx/modules/*.so \
79102
&& runDeps="$( \
80-
scanelf --needed --nobanner /usr/sbin/nginx \
103+
scanelf --needed --nobanner /usr/sbin/nginx /usr/lib/nginx/modules/*.so \
81104
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
82105
| sort -u \
83106
| xargs -r apk info --installed \

stable/jessie/Dockerfile

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,20 @@ FROM debian:jessie
22

33
MAINTAINER NGINX Docker Maintainers "[email protected]"
44

5-
ENV NGINX_VERSION 1.8.1-1~jessie
5+
ENV NGINX_VERSION 1.10.0-1~jessie
66

77
RUN apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys 573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62 \
88
&& echo "deb http://nginx.org/packages/debian/ jessie nginx" >> /etc/apt/sources.list \
99
&& apt-get update \
1010
&& apt-get install --no-install-recommends --no-install-suggests -y \
11-
ca-certificates nginx=${NGINX_VERSION} gettext-base \
11+
ca-certificates \
12+
nginx=${NGINX_VERSION} \
13+
nginx-module-xslt \
14+
nginx-module-geoip \
15+
nginx-module-image-filter \
16+
nginx-module-perl \
17+
nginx-module-njs \
18+
gettext-base \
1219
&& rm -rf /var/lib/apt/lists/*
1320

1421
# forward request and error logs to docker log collector

0 commit comments

Comments
 (0)