diff --git a/Dockerfile b/Dockerfile index 02638f5..6f4abf7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 \ diff --git a/nginx.conf b/nginx.conf index c7253ea..58bda0b 100644 --- a/nginx.conf +++ b/nginx.conf @@ -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 {