Merge pull request #46 from dromer/master

update alpine, ffmpeg, compile flags, and disable librtmp

Author: alfg

Dockerfile

@@ -1,11 +1,11 @@
 ARG NGINX_VERSION=1.16.1
 ARG NGINX_RTMP_VERSION=1.2.1
-ARG FFMPEG_VERSION=4.2.1
+ARG FFMPEG_VERSION=4.2.2
 
 
 ##############################
 # Build the NGINX-build image.
-FROM alpine:3.8 as build-nginx
+FROM alpine:3.11 as build-nginx
 ARG NGINX_VERSION
 ARG NGINX_RTMP_VERSION
 
@@ -48,12 +48,13 @@ RUN cd /tmp/nginx-${NGINX_VERSION} && \
   --with-threads \
   --with-file-aio \
   --with-http_ssl_module \
-  --with-debug && \
+  --with-debug \
+  --with-cc-opt="-Wimplicit-fallthrough=0" && \
   cd /tmp/nginx-${NGINX_VERSION} && make && make install
 
 ###############################
 # Build the FFmpeg-build image.
-FROM alpine:3.8 as build-ffmpeg
+FROM alpine:3.11 as build-ffmpeg
 ARG FFMPEG_VERSION
 ARG PREFIX=/usr/local
 ARG MAKEFLAGS="-j4"
@@ -71,6 +72,7 @@ RUN apk add --update \
   libvorbis-dev \
   libwebp-dev \
   libtheora-dev \
+  openssl-dev \
   opus-dev \
   pkgconf \
   pkgconfig \
@@ -106,7 +108,6 @@ RUN cd /tmp/ffmpeg-${FFMPEG_VERSION} && \
   --enable-libfdk-aac \
   --enable-libass \
   --enable-libwebp \
-  --enable-librtmp \
   --enable-postproc \
   --enable-avresample \
   --enable-libfreetype \
@@ -122,7 +123,7 @@ RUN rm -rf /var/cache/* /tmp/*
 
 ##########################
 # Build the release image.
-FROM alpine:3.8
+FROM alpine:3.11
 LABEL MAINTAINER Alfred Gutierrez <alf.g.jr@gmail.com>
 
 RUN apk add --update \