Skip to content

Commit

Permalink
Updated module versions to latest
Browse files Browse the repository at this point in the history
  • Loading branch information
shakahl committed Aug 21, 2018
1 parent 81e088a commit 53b3c31
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
18 changes: 9 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
FROM alpine:3.4
MAINTAINER Soma Szélpál <[email protected]>

ENV NGINX_VERSION 1.13.3
ENV NGINX_VERSION 1.15.2
ENV NGINX_DEVEL_KIT_VERSION=0.3.0
ENV NGINX_RTMP_MODULE_VERSION 1.2.0
ENV NGINX_LUA_MODULE_VERSION=0.10.8
ENV NGINX_RTMP_MODULE_VERSION 1.2.1
ENV NGINX_LUA_MODULE_VERSION=0.10.13
ENV LUAJIT_VERSION=2.0.5
ENV FFMPEG_VERSION 3.3.3
ENV LUAROCKS_VERSION 2.4.2
ENV OPENRESTY_VERSION 1.11.2.3
ENV FFMPEG_VERSION=4.0.2
ENV LUAROCKS_VERSION=3.0.0
ENV OPENRESTY_VERSION=1.13.6.1

ENV NGINX_DEVEL_KIT ngx_devel_kit-${NGINX_DEVEL_KIT_VERSION}
ENV NGINX_RTMP_MODULE nginx-rtmp-module-${NGINX_RTMP_MODULE_VERSION}
Expand Down Expand Up @@ -93,9 +93,9 @@ RUN cd /tmp \
&& rm ${NGINX_LUA_MODULE}.tar.gz

# patch nginx lua compilation error on nginx 1.13 (https://github.com/openresty/lua-nginx-module/issues/1016)
ADD ./patch/patch-src-ngx_http_lua_headers.c.diff /tmp/
RUN cd /tmp/${NGINX_LUA_MODULE}/src \
&& patch < /tmp/patch-src-ngx_http_lua_headers.c.diff
#ADD ./patch/patch-src-ngx_http_lua_headers.c.diff /tmp/
#RUN cd /tmp/${NGINX_LUA_MODULE}/src \
# && patch < /tmp/patch-src-ngx_http_lua_headers.c.diff

# Compile nginx with nginx-rtmp module.
RUN cd /tmp/nginx-${NGINX_VERSION} \
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
A Dockerfile installing NGINX, nginx-rtmp-module and FFmpeg from source with
default settings for HLS live streaming. Built on Alpine Linux.

* Nginx 1.13.3 (compiled from source)
* nginx-rtmp-module 1.2.0 (compiled from source)
* lua-nginx-module 0.10.8 (compiled from source)
* ffmpeg 3.3.3 (compiled from source)
* Nginx 1.15.2 (compiled from source)
* nginx-rtmp-module 1.2.1 (compiled from source)
* lua-nginx-module 0.10.13 (compiled from source)
* ffmpeg 4.0.2 (compiled from source)
* Default HLS settings (See: [nginx.conf](nginx.conf))
* LuaJIT 2.0.5 (compiled from source)
* luarocks 2.4.2 (compiled from source)
* OpenResty 1.11.2.3 (compiled from source)
* luarocks 3.0.0 (compiled from source)
* OpenResty 1.13.6.1 (compiled from source)

[![Docker Stars](https://img.shields.io/docker/stars/shakahl/docker-alpine-nginx-rtmp.svg)](https://hub.docker.com/r/shakahl/docker-alpine-nginx-rtmp/)
[![Docker Pulls](https://img.shields.io/docker/pulls/shakahl/docker-alpine-nginx-rtmp.svg)](https://hub.docker.com/r/shakahl/docker-alpine-nginx-rtmp/)
Expand Down

0 comments on commit 53b3c31

Please sign in to comment.