Skip to content

Commit

Permalink
Update Nginx, Alpine and ffmpeg (#105)
Browse files Browse the repository at this point in the history
* Update Nginx, Alpine and ffmpeg

* Update versions on cuda image too

* Reference new versions in README too

* Remove avresample, it's deprecated and removed in ffmpeg 5.0
  • Loading branch information
rmens authored Feb 18, 2022
1 parent 5d02eee commit 6fa1fb0
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 12 deletions.
12 changes: 5 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
ARG NGINX_VERSION=1.21.4
ARG NGINX_VERSION=1.21.6
ARG NGINX_RTMP_VERSION=1.2.2
ARG FFMPEG_VERSION=4.4

ARG FFMPEG_VERSION=5.0

##############################
# Build the NGINX-build image.
FROM alpine:3.14.2 as build-nginx
FROM alpine:3.15.0 as build-nginx
ARG NGINX_VERSION
ARG NGINX_RTMP_VERSION

Expand Down Expand Up @@ -55,7 +54,7 @@ RUN cd /tmp/nginx-${NGINX_VERSION} && \

###############################
# Build the FFmpeg-build image.
FROM alpine:3.14.2 as build-ffmpeg
FROM alpine:3.15.0 as build-ffmpeg
ARG FFMPEG_VERSION
ARG PREFIX=/usr/local
ARG MAKEFLAGS="-j4"
Expand Down Expand Up @@ -110,7 +109,6 @@ RUN cd /tmp/ffmpeg-${FFMPEG_VERSION} && \
--enable-libass \
--enable-libwebp \
--enable-postproc \
--enable-avresample \
--enable-libfreetype \
--enable-openssl \
--disable-debug \
Expand All @@ -124,7 +122,7 @@ RUN rm -rf /var/cache/* /tmp/*

##########################
# Build the release image.
FROM alpine:3.14.2
FROM alpine:3.15.0
LABEL MAINTAINER Alfred Gutierrez <alf.g.jr@gmail.com>

# Set default ports.
Expand Down
5 changes: 2 additions & 3 deletions Dockerfile.cuda
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
ARG NGINX_VERSION=1.21.4
ARG NGINX_VERSION=1.21.6
ARG NGINX_RTMP_VERSION=1.2.2
ARG FFMPEG_VERSION=4.4

ARG FFMPEG_VERSION=5.0

##############################
# Build the NGINX-build image.
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.21.4 (Mainline version compiled from source)
* Nginx 1.21.6 (Mainline version compiled from source)
* nginx-rtmp-module 1.2.2 (compiled from source)
* ffmpeg 4.4 (compiled from source)
* ffmpeg 5.0 (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/)
Expand Down

0 comments on commit 6fa1fb0

Please sign in to comment.