Merge pull request #12 from lake54/update-nginx-cors

Update nginx to 1.7.5 and always send CORS header
This commit is contained in:
Orne Brocaar 2017-07-06 09:47:16 +02:00 committed by GitHub
commit c97f751353
2 changed files with 5 additions and 5 deletions

View File

@ -26,16 +26,16 @@ RUN apt-get update && \
# get nginx source
WORKDIR /src
RUN wget http://nginx.org/download/nginx-1.6.2.tar.gz && \
tar zxf nginx-1.6.2.tar.gz && \
rm nginx-1.6.2.tar.gz && \
RUN wget http://nginx.org/download/nginx-1.7.5tar.gz && \
tar zxf nginx-1.7.5.tar.gz && \
rm nginx-1.7.5.tar.gz && \
# get nginx-rtmp module
wget https://github.com/arut/nginx-rtmp-module/archive/v1.1.6.tar.gz && \
tar zxf v1.1.6.tar.gz && \
rm v1.1.6.tar.gz
# compile nginx
WORKDIR /src/nginx-1.6.2
WORKDIR /src/nginx-1.7.5
RUN ./configure --add-module=/src/nginx-rtmp-module-1.1.6 \
--conf-path=/config/nginx.conf \
--error-log-path=/logs/error.log \

View File

@ -48,7 +48,7 @@ http {
}
root /data;
add_header Cache-Control no-cache;
add_header Access-Control-Allow-Origin *;
add_header Access-Control-Allow-Origin * always;
}
location /stat {