Skip to content

Commit edebf3a

Browse files
committed
update nginx and add set-misc module
1 parent 0cf7c9e commit edebf3a

6 files changed

+12
-4
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ MAINTAINER friends@niiknow.org
44

55
ENV LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 LANGUAGE=en_US.UTF-8 \
66
TERM=xterm container=docker DEBIAN_FRONTEND=noninteractive \
7-
NGINX_VERSION=1.13.3-1~xenial_amd64.deb
7+
NGINX_VERSION=1.13.4-1~xenial_amd64.deb
88

99
ADD ./build/nginx_${NGINX_VERSION} /tmp
1010

-7.24 MB
Binary file not shown.
7.26 MB
Binary file not shown.

build/nginx_1.13.3-1~xenial_amd64.deb

-781 KB
Binary file not shown.

build/nginx_1.13.4-1~xenial_amd64.deb

773 KB
Binary file not shown.

build/src/ubuntu.sh

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
#!/bin/bash
22

3-
export NGINX_VERSION=1.13.3
3+
export NGINX_VERSION=1.13.4
44
export NGINX_BUILD_DIR=/usr/src/nginx/nginx-${NGINX_VERSION}
5-
5+
export NGINX_SET_MISC_MODULE_VERSION=0.31
6+
export NGINX_MODULE_SOURCE=https://github.com
67
cd /tmp
8+
9+
curl -sL "$NGINX_MODULE_SOURCE/openresty/set-misc-nginx-module/archive/v$NGINX_SET_MISC_MODULE_VERSION.tar.gz" -o ngx-misc.tar.gz
10+
mkdir -p /usr/src/nginx/set-misc-nginx-module
11+
tar -xof ngx-misc.tar.gz -C /usr/src/nginx/set-misc-nginx-module --strip-components=1
12+
rm ngx-misc.tar.gz
13+
714
curl -s https://nginx.org/keys/nginx_signing.key | apt-key add -
815
cp /etc/apt/sources.list /etc/apt/sources.list.bak
916
echo "deb http://nginx.org/packages/mainline/ubuntu/ xenial nginx" | tee -a /etc/apt/sources.list
@@ -25,10 +32,11 @@ cd ${NGINX_BUILD_DIR}/src/http/modules/
2532
mv ngx_http_image_filter_module.c ngx_http_image_filter_module.bak
2633
mv /tmp/ngx_http_image_filter_module.c ./ngx_http_image_filter_module.c
2734

28-
sed -i "s/--with-http_ssl_module/--with-http_ssl_module --with-http_image_filter_module/g" \
35+
sed -i "s/--with-http_ssl_module/--with-http_ssl_module --with-http_image_filter_module --add-module=/usr/src/nginx/set-misc-nginx-module /g" \
2936
${NGINX_BUILD_DIR}/debian/rules
3037

3138
cd /usr/src/nginx
3239
apt-get build-dep nginx -y
3340
cd ${NGINX_BUILD_DIR}
3441
dpkg-buildpackage -uc -us -b
42+

0 commit comments

Comments
 (0)