From d8011217bb3961c112ed7306db44569e47029c8c Mon Sep 17 00:00:00 2001 From: Alfred Gutierrez Date: Tue, 15 Sep 2020 22:00:16 -0700 Subject: [PATCH] Upgrade NGINX to 1.18.0 and FFmpeg to 4.3.1. (#71) * Upgrade NGINX to 1.18.0 and FFmpeg to 4.3.1. * Fix readme. --- Dockerfile | 4 ++-- README.md | 29 ++++++++++++++--------------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index 66738b1..9ba4fbf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -ARG NGINX_VERSION=1.16.1 +ARG NGINX_VERSION=1.18.0 ARG NGINX_RTMP_VERSION=1.2.1 -ARG FFMPEG_VERSION=4.2.2 +ARG FFMPEG_VERSION=4.3.1 ############################## diff --git a/README.md b/README.md index f98717c..f4130fc 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,9 @@ A Dockerfile installing NGINX, nginx-rtmp-module and FFmpeg from source with default settings for HLS live streaming. Built on Alpine Linux. -* Nginx 1.16.1 (Stable version compiled from source) +* Nginx 1.18.0 (Stable version compiled from source) * nginx-rtmp-module 1.2.1 (compiled from source) -* ffmpeg 4.2.1 (compiled from source) +* ffmpeg 4.3.1 (compiled from source) * Default HLS settings (See: [nginx.conf](nginx.conf)) [![Docker Stars](https://img.shields.io/docker/stars/alfg/nginx-rtmp.svg)](https://hub.docker.com/r/alfg/nginx-rtmp/) @@ -67,25 +67,25 @@ volumes: http://:8080/live/$STREAM_NAME.m3u8 ``` * Example Playlist: `http://localhost:8080/live/hello.m3u8` -* [VideoJS Player](https://video-dev.github.io/hls.js/stable/demo/?src=http%3A%2F%2Flocalhost%3A8080%2Flive%2Fhello.m3u8) +* [VideoJS Player](https://hls-js.netlify.app/demo/?src=http%3A%2F%2Flocalhost%3A8080%2Flive%2Fhello.m3u8) * FFplay: `ffplay -fflags nobuffer rtmp://localhost:1935/stream/hello` ### FFmpeg Build ``` $ ffmpeg -buildconf -ffmpeg version 4.2.1 Copyright (c) 2000-2019 the FFmpeg developers - built with gcc 6.4.0 (Alpine 6.4.0) - configuration: --prefix=/usr/local --enable-version3 --enable-gpl --enable-nonfree --enable-small --enable-libmp3lame --enable-libx264 --enable-libx265 --enable-libvpx --enable-libtheora --enable-libvorbis --enable-libopus --enable-libfdk-aac --enable-libass --enable-libwebp --enable-librtmp --enable-postproc --enable-avresample --enable-libfreetype --enable-openssl --disable-debug --disable-doc --disable-ffplay --extra-libs='-lpthread -lm' - libavutil 56. 31.100 / 56. 31.100 - libavcodec 58. 54.100 / 58. 54.100 - libavformat 58. 29.100 / 58. 29.100 - libavdevice 58. 8.100 / 58. 8.100 - libavfilter 7. 57.100 / 7. 57.100 +ffmpeg version 4.3.1 Copyright (c) 2000-2020 the FFmpeg developers + built with gcc 9.3.0 (Alpine 9.3.0) + configuration: --prefix=/usr/local --enable-version3 --enable-gpl --enable-nonfree --enable-small --enable-libmp3lame --enable-libx264 --enable-libx265 --enable-libvpx --enable-libtheora --enable-libvorbis --enable-libopus --enable-libfdk-aac --enable-libass --enable-libwebp --enable-postproc --enable-avresample --enable-libfreetype --enable-openssl --disable-debug --disable-doc --disable-ffplay --extra-libs='-lpthread -lm' + libavutil 56. 51.100 / 56. 51.100 + libavcodec 58. 91.100 / 58. 91.100 + libavformat 58. 45.100 / 58. 45.100 + libavdevice 58. 10.100 / 58. 10.100 + libavfilter 7. 85.100 / 7. 85.100 libavresample 4. 0. 0 / 4. 0. 0 - libswscale 5. 5.100 / 5. 5.100 - libswresample 3. 5.100 / 3. 5.100 - libpostproc 55. 5.100 / 55. 5.100 + libswscale 5. 7.100 / 5. 7.100 + libswresample 3. 7.100 / 3. 7.100 + libpostproc 55. 7.100 / 55. 7.100 configuration: --prefix=/usr/local @@ -103,7 +103,6 @@ ffmpeg version 4.2.1 Copyright (c) 2000-2019 the FFmpeg developers --enable-libfdk-aac --enable-libass --enable-libwebp - --enable-librtmp --enable-postproc --enable-avresample --enable-libfreetype