diff --git a/Dockerfile b/Dockerfile index b0ab369..8501fbb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,15 @@ -FROM ubuntu:18.04 +FROM phusion/baseimage:bionic-1.0.0 LABEL author Andreas Neue -ENV NGINX_VERSION 1.13.9 +ENV NGINX_VERSION 1.19.0 +ENV NGINX_VTS_VERSION 0.1.18 ENV NGINX_RTMP_VERSION 1.2.1 ENV FFMPEG_VERSION 3.4.2 EXPOSE 1935 EXPOSE 80 -RUN mkdir -p /opt/data && mkdir -p /opt/nginx/conf && mkdir /www +RUN mkdir -p /opt/data && mkdir /www # Build dependencies. @@ -58,17 +59,23 @@ RUN cd /tmp && \ wget https://github.com/arut/nginx-rtmp-module/archive/v${NGINX_RTMP_VERSION}.tar.gz && \ tar zxf v${NGINX_RTMP_VERSION}.tar.gz && rm v${NGINX_RTMP_VERSION}.tar.gz +RUN cd /tmp && \ + curl -fSL https://github.com/vozlt/nginx-module-vts/archive/v${NGINX_VTS_VERSION}.tar.gz -o nginx-module-vts-${NGINX_VTS_VERSION}.tar.gz && \ + tar -zxf nginx-module-vts-${NGINX_VTS_VERSION}.tar.gz && \ + rm nginx-module-vts-${NGINX_VTS_VERSION}.tar.gz + RUN cd /tmp/nginx-${NGINX_VERSION} && \ ./configure \ --prefix=/opt/nginx \ --add-module=/tmp/nginx-rtmp-module-${NGINX_RTMP_VERSION} \ + --add-module=/tmp/nginx-module-vts-${NGINX_VTS_VERSION} \ --conf-path=/opt/nginx/nginx.conf \ --error-log-path=/opt/nginx/logs/error.log \ --http-log-path=/opt/nginx/logs/access.log \ --with-debug && \ cd /tmp/nginx-${NGINX_VERSION} && make && make install -VOLUME /opt/nginx/conf -VOLUME /www/static +ADD nginx.conf /opt/nginx/nginx.conf +ADD static /www/static -CMD ["/opt/nginx/sbin/nginx", "-c", "/opt/nginx/conf/nginx.conf"] +CMD ["/opt/nginx/sbin/nginx"] diff --git a/LICENSE b/LICENSE index d466ae9..6c2cc83 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,7 @@ The MIT License (MIT) Copyright (c) 2016 Alfred Gutierrez +Copyright (c) 2019-2020 Andreas Neue Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal