Skip to content

Commit 4dcedf1

Browse files
authored
Bump nginx, nginx-rtmp-module, alpine (#97)
- nginx: 1.19.7 -> 1.21.0 - nginx-rtmp-module: 1.2.1 -> 1.2.2 - alpine: 3.13 -> 3.14
1 parent 0a9c727 commit 4dcedf1

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
ARG NGINX_VERSION=1.19.7
2-
ARG NGINX_RTMP_VERSION=1.2.1
1+
ARG NGINX_VERSION=1.21.0
2+
ARG NGINX_RTMP_VERSION=1.2.2
33
ARG FFMPEG_VERSION=4.4
44

55

66
##############################
77
# Build the NGINX-build image.
8-
FROM alpine:3.13 as build-nginx
8+
FROM alpine:3.14 as build-nginx
99
ARG NGINX_VERSION
1010
ARG NGINX_RTMP_VERSION
1111

@@ -54,7 +54,7 @@ RUN cd /tmp/nginx-${NGINX_VERSION} && \
5454

5555
###############################
5656
# Build the FFmpeg-build image.
57-
FROM alpine:3.13 as build-ffmpeg
57+
FROM alpine:3.14 as build-ffmpeg
5858
ARG FFMPEG_VERSION
5959
ARG PREFIX=/usr/local
6060
ARG MAKEFLAGS="-j4"
@@ -123,7 +123,7 @@ RUN rm -rf /var/cache/* /tmp/*
123123

124124
##########################
125125
# Build the release image.
126-
FROM alpine:3.13
126+
FROM alpine:3.14
127127
LABEL MAINTAINER Alfred Gutierrez <[email protected]>
128128

129129
# Set default ports.

Dockerfile.cuda

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG NGINX_VERSION=1.18.0
2-
ARG NGINX_RTMP_VERSION=1.2.1
1+
ARG NGINX_VERSION=1.21.0
2+
ARG NGINX_RTMP_VERSION=1.2.2
33
ARG FFMPEG_VERSION=4.4
44

55

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
A Dockerfile installing NGINX, nginx-rtmp-module and FFmpeg from source with
33
default settings for HLS live streaming. Built on Alpine Linux.
44

5-
* Nginx 1.19.7 (Mainline version compiled from source)
6-
* nginx-rtmp-module 1.2.1 (compiled from source)
5+
* Nginx 1.21.0 (Mainline version compiled from source)
6+
* nginx-rtmp-module 1.2.2 (compiled from source)
77
* ffmpeg 4.4 (compiled from source)
88
* Default HLS settings (See: [nginx.conf](nginx.conf))
99

0 commit comments

Comments
 (0)