From a900fcd675dce6d82982dbcd57174ab7b7f0de53 Mon Sep 17 00:00:00 2001
From: Zhizhen Tang <zhizhen.tang@intel.com>
Date: Sun, 29 Sep 2019 10:58:46 +0800
Subject: [PATCH] Upgrade Nginx and Nginx HTTP FLV module

Signed-off-by: Zhizhen Tang <zhizhen.tang@intel.com>
---
 cdn-server/Dockerfile                             |  6 +++---
 doc/CDN_Transcode_Sample_Getting_Started_Guide.md | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cdn-server/Dockerfile b/cdn-server/Dockerfile
index 98c6eed..0cef3c2 100644
--- a/cdn-server/Dockerfile
+++ b/cdn-server/Dockerfile
@@ -20,10 +20,10 @@ ARG AUTOMAKE_REPO=https://ftp.gnu.org/pub/gnu/automake/automake-${AUTOMAKE_VER}.
     RUN apt-get install -y -q automake
 
 # Build nginx-http-flv
-ARG NGINX_HTTP_FLV_VER=04dc8369b260c8c851f12fc30ea2f9df03f73c4e
+ARG NGINX_HTTP_FLV_VER=10bd726e6c4c3033be9e6169ea259c9355e9223a
 ARG NGINX_HTTP_FLV_REPO=https://github.com/winshining/nginx-http-flv-module.git
 
-ARG NGINX_HTTP_FLV_PATCHES_RELEASE_VER=0.1
+ARG NGINX_HTTP_FLV_PATCHES_RELEASE_VER=0.2
 ARG NGINX_HTTP_FLV_PATCHES_RELEASE_URL=https://github.com/VCDP/CDN/archive/v${NGINX_HTTP_FLV_PATCHES_RELEASE_VER}.tar.gz
 ARG NGINX_HTTP_FLV_PATCHES_PATH=/home/CDN-${NGINX_HTTP_FLV_PATCHES_RELEASE_VER}
 RUN wget -O - ${NGINX_HTTP_FLV_PATCHES_RELEASE_URL} | tar xz
@@ -34,7 +34,7 @@ RUN git clone ${NGINX_HTTP_FLV_REPO} && \
     find ${NGINX_HTTP_FLV_PATCHES_PATH}/Nginx-HTTP-FLV_patches -type f -name '*.patch' -print0 | sort -z | xargs -t -0 -n 1 patch -p1 -i;
 
 # Build nginx & nginx-rtmp
-ARG NGINX_VER=1.14.2
+ARG NGINX_VER=1.15.12
 ARG NGINX_REPO=https://nginx.org/download/nginx-${NGINX_VER}.tar.gz
 
 RUN apt-get update && apt-get install -y -q --no-install-recommends libssl-dev libpcre3-dev zlib1g-dev libxslt1-dev
diff --git a/doc/CDN_Transcode_Sample_Getting_Started_Guide.md b/doc/CDN_Transcode_Sample_Getting_Started_Guide.md
index 00248df..bc40290 100644
--- a/doc/CDN_Transcode_Sample_Getting_Started_Guide.md
+++ b/doc/CDN_Transcode_Sample_Getting_Started_Guide.md
@@ -73,14 +73,14 @@ As mentioned above, Streaing Server is not a must, you can skip this section if
 ```sh
 sudo apt-get install -y ffmpeg
 ```
-- Install Nginx and Nginx RTMP Module
+- Install Nginx and Nginx HTTP FLV Module
 ```
-git clone https://github.com/arut/nginx-rtmp-module.git
+git clone https://github.com/winshining/nginx-http-flv-module.git
 
-wget http://nginx.org/download/nginx-1.14.2.tar.gz
-tar -xvzf nginx-1.14.2.tar.gz
-cd nginx-1.14.2
-./configure --prefix=/usr/local/nginx --conf-path=/etc/nginx/nginx.conf --add-module=/path/to/nginx-rtmp-module
+wget http://nginx.org/download/nginx-1.15.12.tar.gz
+tar -xvzf nginx-1.15.12.tar.gz
+cd nginx-1.15.12
+./configure --prefix=/usr/local/nginx --conf-path=/etc/nginx/nginx.conf --add-module=/path/to/nginx-http-flv-module
 make && sudo make install
 ```