diff --git a/Dockerfile b/Dockerfile index 1c8d67e..db852cd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 @@ -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" @@ -110,7 +109,6 @@ RUN cd /tmp/ffmpeg-${FFMPEG_VERSION} && \ --enable-libass \ --enable-libwebp \ --enable-postproc \ - --enable-avresample \ --enable-libfreetype \ --enable-openssl \ --disable-debug \ @@ -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 # Set default ports. diff --git a/Dockerfile.cuda b/Dockerfile.cuda index 69e8608..c1b39d6 100644 --- a/Dockerfile.cuda +++ b/Dockerfile.cuda @@ -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. diff --git a/README.md b/README.md index dddd7f1..37f65ed 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.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/)