sys
/
docker-nginx-rtmp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #6 from alfg/feature/update-alpine-3.4 

Update Alpine to 3.4. Version bumps for ffmpeg, nginx, and nginx-rtmp
This commit is contained in:
Alfred Gutierrez 2018-02-17 21:25:34 -08:00 committed by GitHub
parent 6092a91c0e adf6afa3ed
commit 82280a1462
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Dockerfile
View File

@ -1,9 +1,9 @@
FROM alpine:3.3 FROM alpine:3.4
MAINTAINER Alfred Gutierrez <alf.g.jr@gmail.com> LABEL author Alfred Gutierrez <alf.g.jr@gmail.com>
ENV NGINX_VERSION 1.13.6 ENV NGINX_VERSION 1.13.8
ENV NGINX_RTMP_VERSION 1.2.0 ENV NGINX_RTMP_VERSION 1.2.1
ENV FFMPEG_VERSION 3.3.4 ENV FFMPEG_VERSION 3.4.2
EXPOSE 1935 EXPOSE 1935
EXPOSE 80 EXPOSE 80

26
README.md
View File

@ -2,9 +2,9 @@
A Dockerfile installing NGINX, nginx-rtmp-module and FFmpeg from source with A Dockerfile installing NGINX, nginx-rtmp-module and FFmpeg from source with
default settings for HLS live streaming. Built on Alpine Linux. default settings for HLS live streaming. Built on Alpine Linux.
* Nginx 1.13.6 (compiled from source) * Nginx 1.13.8 (compiled from source)
* nginx-rtmp-module 1.2.0 (compiled from source) * nginx-rtmp-module 1.2.1 (compiled from source)
* ffmpeg 3.3.4 (compiled from source) * ffmpeg 3.4.2 (compiled from source)
* Default HLS settings (See: [nginx.conf](nginx.conf)) * 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/) [![Docker Stars](https://img.shields.io/docker/stars/alfg/nginx-rtmp.svg)](https://hub.docker.com/r/alfg/nginx-rtmp/)
@ -48,18 +48,18 @@ http://<server ip>:8080/live/$STREAM_NAME.m3u8
### FFmpeg Build ### FFmpeg Build
``` ```
ffmpeg version 3.3.2 Copyright (c) 2000-2016 the FFmpeg developers ffmpeg version 3.4.2 Copyright (c) 2000-2018 the FFmpeg developers
built with gcc 5.3.0 (Alpine 5.3.0) built with gcc 5.3.0 (Alpine 5.3.0)
configuration: --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 configuration: --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
libavutil 55. 17.103 / 55. 17.103 libavutil 55. 78.100 / 55. 78.100
libavcodec 57. 24.102 / 57. 24.102 libavcodec 57.107.100 / 57.107.100
libavformat 57. 25.100 / 57. 25.100 libavformat 57. 83.100 / 57. 83.100
libavdevice 57. 0.101 / 57. 0.101 libavdevice 57. 10.100 / 57. 10.100
libavfilter 6. 31.100 / 6. 31.100 libavfilter 6.107.100 / 6.107.100
libavresample 3. 0. 0 / 3. 0. 0 libavresample 3. 7. 0 / 3. 7. 0
libswscale 4. 0.100 / 4. 0.100 libswscale 4. 8.100 / 4. 8.100
libswresample 2. 0.101 / 2. 0.101 libswresample 2. 9.100 / 2. 9.100
libpostproc 54. 0.100 / 54. 0.100 libpostproc 54. 7.100 / 54. 7.100
configuration: configuration:
--enable-version3 --enable-version3