Skip to content
This repository was archived by the owner on Nov 11, 2024. It is now read-only.

Commit a900fcd

Browse files
committed
Upgrade Nginx and Nginx HTTP FLV module
Signed-off-by: Zhizhen Tang <zhizhen.tang@intel.com>
1 parent c94656a commit a900fcd

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

cdn-server/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ ARG AUTOMAKE_REPO=https://ftp.gnu.org/pub/gnu/automake/automake-${AUTOMAKE_VER}.
2020
RUN apt-get install -y -q automake
2121

2222
# Build nginx-http-flv
23-
ARG NGINX_HTTP_FLV_VER=04dc8369b260c8c851f12fc30ea2f9df03f73c4e
23+
ARG NGINX_HTTP_FLV_VER=10bd726e6c4c3033be9e6169ea259c9355e9223a
2424
ARG NGINX_HTTP_FLV_REPO=https://github.com/winshining/nginx-http-flv-module.git
2525

26-
ARG NGINX_HTTP_FLV_PATCHES_RELEASE_VER=0.1
26+
ARG NGINX_HTTP_FLV_PATCHES_RELEASE_VER=0.2
2727
ARG NGINX_HTTP_FLV_PATCHES_RELEASE_URL=https://github.com/VCDP/CDN/archive/v${NGINX_HTTP_FLV_PATCHES_RELEASE_VER}.tar.gz
2828
ARG NGINX_HTTP_FLV_PATCHES_PATH=/home/CDN-${NGINX_HTTP_FLV_PATCHES_RELEASE_VER}
2929
RUN wget -O - ${NGINX_HTTP_FLV_PATCHES_RELEASE_URL} | tar xz
@@ -34,7 +34,7 @@ RUN git clone ${NGINX_HTTP_FLV_REPO} && \
3434
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;
3535

3636
# Build nginx & nginx-rtmp
37-
ARG NGINX_VER=1.14.2
37+
ARG NGINX_VER=1.15.12
3838
ARG NGINX_REPO=https://nginx.org/download/nginx-${NGINX_VER}.tar.gz
3939

4040
RUN apt-get update && apt-get install -y -q --no-install-recommends libssl-dev libpcre3-dev zlib1g-dev libxslt1-dev

doc/CDN_Transcode_Sample_Getting_Started_Guide.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,14 @@ As mentioned above, Streaing Server is not a must, you can skip this section if
7373
```sh
7474
sudo apt-get install -y ffmpeg
7575
```
76-
- Install Nginx and Nginx RTMP Module
76+
- Install Nginx and Nginx HTTP FLV Module
7777
```
78-
git clone https://github.com/arut/nginx-rtmp-module.git
78+
git clone https://github.com/winshining/nginx-http-flv-module.git
7979
80-
wget http://nginx.org/download/nginx-1.14.2.tar.gz
81-
tar -xvzf nginx-1.14.2.tar.gz
82-
cd nginx-1.14.2
83-
./configure --prefix=/usr/local/nginx --conf-path=/etc/nginx/nginx.conf --add-module=/path/to/nginx-rtmp-module
80+
wget http://nginx.org/download/nginx-1.15.12.tar.gz
81+
tar -xvzf nginx-1.15.12.tar.gz
82+
cd nginx-1.15.12
83+
./configure --prefix=/usr/local/nginx --conf-path=/etc/nginx/nginx.conf --add-module=/path/to/nginx-http-flv-module
8484
make && sudo make install
8585
```
8686

0 commit comments

Comments
 (0)