Browse Source

Fix docker build

tags/v2.5-rc1
V. Soshnikov 2 years ago
parent
commit
863e9bdd0e
2 changed files with 3 additions and 5 deletions
  1. 3
    4
      Dockerfile
  2. 0
    1
      docker-compose.yml

+ 3
- 4
Dockerfile View File

@@ -94,22 +94,21 @@ RUN set -x \
&& git -C /usr/src/nginx_upstream_module submodule init \
&& git -C /usr/src/nginx_upstream_module submodule update \
&& make -C /usr/src/nginx_upstream_module yajl \
&& make -C /usr/src/nginx_upstream_module msgpack \
&& : "---------- download nginx ----------" \
&& curl -fSL http://nginx.org/download/nginx-$NGINX_VERSION.tar.gz \
-o nginx.tar.gz \
&& curl -fSL http://nginx.org/download/nginx-$NGINX_VERSION.tar.gz.asc \
-o nginx.tar.gz.asc \
&& : "---------- verify signatures ----------" \
&& export GNUPGHOME="$(mktemp -d)" \
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$NGINX_GPG_KEYS" \
&& gpg --batch --verify nginx.tar.gz.asc nginx.tar.gz \
&& rm -r "$GNUPGHOME" nginx.tar.gz.asc \
&& mkdir -p /usr/src/nginx \
&& tar -xzf nginx.tar.gz -C /usr/src/nginx \
--strip-components=1 \
&& cd /usr/src/nginx \
&& : "---------- build nginx ----------" \
&& ./configure \
--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' \
--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' \
--add-module=/usr/src/nginx_upstream_module \
--prefix=/etc/nginx \
--sbin-path=/usr/sbin/nginx \

+ 0
- 1
docker-compose.yml View File

@@ -36,7 +36,6 @@ services:
location /tnt_rest {
tnt_http_rest_methods get post put delete;
tnt_pass_http_request on;
tnt_multireturn_skip_count 2;
tnt_pure_result on;
tnt_pass backend;
add_header Content-Type text/plain;

Loading…
Cancel
Save