Skip to content

Commit

Permalink
Bump nginx, nginx-rtmp-module, alpine (alfg#97)
Browse files Browse the repository at this point in the history
- nginx: 1.19.7 -> 1.21.0
- nginx-rtmp-module: 1.2.1 -> 1.2.2
- alpine: 3.13 -> 3.14
  • Loading branch information
oxzi committed Jun 24, 2021
1 parent 0a9c727 commit 4dcedf1
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions Dockerfile
@@ -1,11 +1,11 @@
ARG NGINX_VERSION=1.19.7
ARG NGINX_RTMP_VERSION=1.2.1
ARG NGINX_VERSION=1.21.0
ARG NGINX_RTMP_VERSION=1.2.2
ARG FFMPEG_VERSION=4.4


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

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

###############################
# Build the FFmpeg-build image.
FROM alpine:3.13 as build-ffmpeg
FROM alpine:3.14 as build-ffmpeg
ARG FFMPEG_VERSION
ARG PREFIX=/usr/local
ARG MAKEFLAGS="-j4"
Expand Down Expand Up @@ -123,7 +123,7 @@ RUN rm -rf /var/cache/* /tmp/*

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

# Set default ports.
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.cuda
@@ -1,5 +1,5 @@
ARG NGINX_VERSION=1.18.0
ARG NGINX_RTMP_VERSION=1.2.1
ARG NGINX_VERSION=1.21.0
ARG NGINX_RTMP_VERSION=1.2.2
ARG FFMPEG_VERSION=4.4


Expand Down
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -2,8 +2,8 @@
A Dockerfile installing NGINX, nginx-rtmp-module and FFmpeg from source with
default settings for HLS live streaming. Built on Alpine Linux.

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

Expand Down

0 comments on commit 4dcedf1

Please sign in to comment.