File tree Expand file tree Collapse file tree 2 files changed +3
-5
lines changed
Expand file tree Collapse file tree 2 files changed +3
-5
lines changed Original file line number Diff line number Diff line change @@ -94,22 +94,21 @@ RUN set -x \
9494 && git -C /usr/src/nginx_upstream_module submodule init \
9595 && git -C /usr/src/nginx_upstream_module submodule update \
9696 && make -C /usr/src/nginx_upstream_module yajl \
97+ && make -C /usr/src/nginx_upstream_module msgpack \
9798 && : "---------- download nginx ----------" \
9899 && curl -fSL http://nginx.org/download/nginx-$NGINX_VERSION.tar.gz \
99100 -o nginx.tar.gz \
100101 && curl -fSL http://nginx.org/download/nginx-$NGINX_VERSION.tar.gz.asc \
101102 -o nginx.tar.gz.asc \
102103 && : "---------- verify signatures ----------" \
103- && export GNUPGHOME="$(mktemp -d)" \
104- && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$NGINX_GPG_KEYS" \
105- && gpg --batch --verify nginx.tar.gz.asc nginx.tar.gz \
106- && rm -r "$GNUPGHOME" nginx.tar.gz.asc \
107104 && mkdir -p /usr/src/nginx \
108105 && tar -xzf nginx.tar.gz -C /usr/src/nginx \
109106 --strip-components=1 \
110107 && cd /usr/src/nginx \
111108 && : "---------- build nginx ----------" \
112109 && ./configure \
110+ --with-cc-opt='-I/usr/src/nginx_upstream_module/third_party/third_party/msgpuck -I /usr/src/nginx_upstream_module/third_party/yajl/build/yajl-2.1.0/include' \
111+ --with-ld-opt='/usr/src/nginx_upstream_module/third_party/yajl/build/yajl-2.1.0/lib/libyajl_s.a -L /usr/src/nginx_upstream_module/third_party/third_party/msgpuck' \
113112 --add-module=/usr/src/nginx_upstream_module \
114113 --prefix=/etc/nginx \
115114 --sbin-path=/usr/sbin/nginx \
Original file line number Diff line number Diff line change @@ -36,7 +36,6 @@ services:
3636 location /tnt_rest {
3737 tnt_http_rest_methods get post put delete;
3838 tnt_pass_http_request on;
39- tnt_multireturn_skip_count 2;
4039 tnt_pure_result on;
4140 tnt_pass backend;
4241 add_header Content-Type text/plain;
You can’t perform that action at this time.
0 commit comments