johanels/datarhei-restreamer
1
0
Fork 0
mirror of https://github.com/datarhei/restreamer.git synced 2025-12-12 06:24:08 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Upgrade base image to buster, upgrade versions

Browse Source
This commit is contained in:
Ingo Oppermann
2020-01-21 12:14:00 +01:00
parent bd7644d347
commit efaaee9228
3 changed files with 22 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Dockerfile
View File

@@ -1,4 +1,4 @@
ARG IMAGE=amd64/debian:stretch-slim ARG IMAGE=amd64/debian:10.2-slim
FROM $IMAGE as builder FROM $IMAGE as builder
@@ -6,12 +6,10 @@ MAINTAINER datarhei <info@datarhei.org>
ARG NASM_VERSION=2.14.02 ARG NASM_VERSION=2.14.02
ARG LAME_VERSION=3.100 ARG LAME_VERSION=3.100
ARG X264_VERSION=20190409-2245-stable
ARG X265_VERSION=3.0
ARG FFMPEG_VERSION=4.1.5 ARG FFMPEG_VERSION=4.1.5
ARG NGINX_VERSION=1.14.2 ARG NGINX_VERSION=1.16.1
ARG NGINXRTMP_VERSION=1.2.1 ARG NGINXRTMP_VERSION=1.2.1
ARG NODE_VERSION=10.15.3 ARG NODE_VERSION=12.14.1
ENV SRC="/usr/local/" \ ENV SRC="/usr/local/" \
LD_LIBRARY_PATH="/usr/local/lib" \ LD_LIBRARY_PATH="/usr/local/lib" \
@@ -26,8 +24,7 @@ RUN apt-get update && \
libssl-dev \ libssl-dev \
zlib1g-dev \ zlib1g-dev \
libasound2-dev \ libasound2-dev \
build-essential \ build-essential
cmake
# nasm # nasm
RUN mkdir -p /dist && cd /dist && \ RUN mkdir -p /dist && cd /dist && \
@@ -40,22 +37,13 @@ RUN mkdir -p /dist && cd /dist && \
# x264 # x264
RUN mkdir -p /dist && cd /dist && \ RUN mkdir -p /dist && cd /dist && \
curl -OL "http://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2" && \ curl -OL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 && \
tar -xvj -f x264-snapshot-${X264_VERSION}.tar.bz2 && \ tar -xvj -f x264-stable.tar.bz2 && \
cd x264-snapshot-${X264_VERSION} && \ cd x264-stable && \
./configure --prefix="${SRC}" --bindir="${SRC}/bin" --enable-shared && \ ./configure --prefix="${SRC}" --bindir="${SRC}/bin" --enable-shared && \
make -j$(nproc) && \ make -j$(nproc) && \
make install make install
# x265
RUN mkdir -p /dist && cd /dist && \
curl -OL "http://ftp.videolan.org/pub/videolan/x265/x265_${X265_VERSION}.tar.gz" && \
tar -xvz -f x265_${X265_VERSION}.tar.gz && \
cd x265_${X265_VERSION}/build && \
cmake ../source && \
make -j$(nproc) && \
make install
# libmp3lame # libmp3lame
RUN mkdir -p /dist && cd /dist && \ RUN mkdir -p /dist && cd /dist && \
curl -OL "https://downloads.sourceforge.net/project/lame/lame/${LAME_VERSION}/lame-${LAME_VERSION}.tar.gz" && \ curl -OL "https://downloads.sourceforge.net/project/lame/lame/${LAME_VERSION}/lame-${LAME_VERSION}.tar.gz" && \
@@ -83,7 +71,6 @@ RUN mkdir -p /dist && cd /dist && \
--enable-version3 \ --enable-version3 \
--enable-libmp3lame \ --enable-libmp3lame \
--enable-libx264 \ --enable-libx264 \
--enable-libx265 \
--enable-openssl \ --enable-openssl \
--enable-postproc \ --enable-postproc \
--enable-small \ --enable-small \
@@ -100,6 +87,7 @@ RUN mkdir -p /dist && cd /dist && \
tar -xvz -f "nginx-${NGINX_VERSION}.tar.gz" && \ tar -xvz -f "nginx-${NGINX_VERSION}.tar.gz" && \
curl -OL "https://github.com/arut/nginx-rtmp-module/archive/v${NGINXRTMP_VERSION}.tar.gz" && \ curl -OL "https://github.com/arut/nginx-rtmp-module/archive/v${NGINXRTMP_VERSION}.tar.gz" && \
tar -xvz -f "v${NGINXRTMP_VERSION}.tar.gz" && \ tar -xvz -f "v${NGINXRTMP_VERSION}.tar.gz" && \
sed -i"" -e '/case ESCAPE:/i /* fall through */' nginx-rtmp-module-${NGINXRTMP_VERSION}/ngx_rtmp_eval.c && \
cd nginx-${NGINX_VERSION} && \ cd nginx-${NGINX_VERSION} && \
./configure --prefix=/usr/local/nginx --with-http_ssl_module --with-http_v2_module --add-module=/dist/nginx-rtmp-module-${NGINXRTMP_VERSION} && \ ./configure --prefix=/usr/local/nginx --with-http_ssl_module --with-http_v2_module --add-module=/dist/nginx-rtmp-module-${NGINXRTMP_VERSION} && \
make -j$(nproc) && \ make -j$(nproc) && \

15
Dockerfile-arm32v7
View File

@@ -1,16 +1,14 @@
ARG IMAGE=arm32v7/debian:stretch-slim ARG IMAGE=arm32v7/debian:10.2-slim
FROM $IMAGE as builder FROM $IMAGE as builder
MAINTAINER datarhei <info@datarhei.org> MAINTAINER datarhei <info@datarhei.org>
ARG LAME_VERSION=3.100 ARG LAME_VERSION=3.100
ARG X264_VERSION=20190409-2245-stable
ARG X265_VERSION=3.0
ARG FFMPEG_VERSION=4.1.5 ARG FFMPEG_VERSION=4.1.5
ARG NGINX_VERSION=1.14.2 ARG NGINX_VERSION=1.16.1
ARG NGINXRTMP_VERSION=1.2.1 ARG NGINXRTMP_VERSION=1.2.1
ARG NODE_VERSION=10.15.3 ARG NODE_VERSION=12.14.1
ENV SRC="/usr/local/" \ ENV SRC="/usr/local/" \
LD_LIBRARY_PATH="/usr/local/lib" \ LD_LIBRARY_PATH="/usr/local/lib" \
@@ -29,9 +27,9 @@ RUN apt-get update && \
# x264 # x264
RUN mkdir -p /dist && cd /dist && \ RUN mkdir -p /dist && cd /dist && \
curl -OL "http://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2" && \ curl -OL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 && \
tar -xvj -f x264-snapshot-${X264_VERSION}.tar.bz2 && \ tar -xvj -f x264-stable.tar.bz2 && \
cd x264-snapshot-${X264_VERSION} && \ cd x264-stable && \
./configure --prefix="${SRC}" --bindir="${SRC}/bin" --enable-shared && \ ./configure --prefix="${SRC}" --bindir="${SRC}/bin" --enable-shared && \
make -j$(nproc) && \ make -j$(nproc) && \
make install make install
@@ -79,6 +77,7 @@ RUN mkdir -p /dist && cd /dist && \
tar -xvz -f "nginx-${NGINX_VERSION}.tar.gz" && \ tar -xvz -f "nginx-${NGINX_VERSION}.tar.gz" && \
curl -OL "https://github.com/arut/nginx-rtmp-module/archive/v${NGINXRTMP_VERSION}.tar.gz" && \ curl -OL "https://github.com/arut/nginx-rtmp-module/archive/v${NGINXRTMP_VERSION}.tar.gz" && \
tar -xvz -f "v${NGINXRTMP_VERSION}.tar.gz" && \ tar -xvz -f "v${NGINXRTMP_VERSION}.tar.gz" && \
sed -i"" -e '/case ESCAPE:/i /* fall through */' nginx-rtmp-module-${NGINXRTMP_VERSION}/ngx_rtmp_eval.c && \
cd nginx-${NGINX_VERSION} && \ cd nginx-${NGINX_VERSION} && \
./configure --prefix=/usr/local/nginx --with-http_ssl_module --with-http_v2_module --add-module=/dist/nginx-rtmp-module-${NGINXRTMP_VERSION} && \ ./configure --prefix=/usr/local/nginx --with-http_ssl_module --with-http_v2_module --add-module=/dist/nginx-rtmp-module-${NGINXRTMP_VERSION} && \
make -j$(nproc) && \ make -j$(nproc) && \

15
Dockerfile-arm64v8
View File

@@ -1,16 +1,14 @@
ARG IMAGE=arm64v8/debian:stretch-slim ARG IMAGE=arm64v8/debian:10.2-slim
FROM $IMAGE as builder FROM $IMAGE as builder
MAINTAINER datarhei <info@datarhei.org> MAINTAINER datarhei <info@datarhei.org>
ARG LAME_VERSION=3.100 ARG LAME_VERSION=3.100
ARG X264_VERSION=20190409-2245-stable
ARG X265_VERSION=3.0
ARG FFMPEG_VERSION=4.1.5 ARG FFMPEG_VERSION=4.1.5
ARG NGINX_VERSION=1.14.2 ARG NGINX_VERSION=1.16.1
ARG NGINXRTMP_VERSION=1.2.1 ARG NGINXRTMP_VERSION=1.2.1
ARG NODE_VERSION=10.15.3 ARG NODE_VERSION=12.14.1
ENV SRC="/usr/local/" \ ENV SRC="/usr/local/" \
LD_LIBRARY_PATH="/usr/local/lib" \ LD_LIBRARY_PATH="/usr/local/lib" \
@@ -29,9 +27,9 @@ RUN apt-get update && \
# x264 # x264
RUN mkdir -p /dist && cd /dist && \ RUN mkdir -p /dist && cd /dist && \
curl -OL "http://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2" && \ curl -OL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 && \
tar -xvj -f x264-snapshot-${X264_VERSION}.tar.bz2 && \ tar -xvj -f x264-stable.tar.bz2 && \
cd x264-snapshot-${X264_VERSION} && \ cd x264-stable && \
./configure --prefix="${SRC}" --bindir="${SRC}/bin" --enable-shared && \ ./configure --prefix="${SRC}" --bindir="${SRC}/bin" --enable-shared && \
make -j$(nproc) && \ make -j$(nproc) && \
make install make install
@@ -79,6 +77,7 @@ RUN mkdir -p /dist && cd /dist && \
tar -xvz -f "nginx-${NGINX_VERSION}.tar.gz" && \ tar -xvz -f "nginx-${NGINX_VERSION}.tar.gz" && \
curl -OL "https://github.com/arut/nginx-rtmp-module/archive/v${NGINXRTMP_VERSION}.tar.gz" && \ curl -OL "https://github.com/arut/nginx-rtmp-module/archive/v${NGINXRTMP_VERSION}.tar.gz" && \
tar -xvz -f "v${NGINXRTMP_VERSION}.tar.gz" && \ tar -xvz -f "v${NGINXRTMP_VERSION}.tar.gz" && \
sed -i"" -e '/case ESCAPE:/i /* fall through */' nginx-rtmp-module-${NGINXRTMP_VERSION}/ngx_rtmp_eval.c && \
cd nginx-${NGINX_VERSION} && \ cd nginx-${NGINX_VERSION} && \
./configure --prefix=/usr/local/nginx --with-http_ssl_module --with-http_v2_module --add-module=/dist/nginx-rtmp-module-${NGINXRTMP_VERSION} && \ ./configure --prefix=/usr/local/nginx --with-http_ssl_module --with-http_v2_module --add-module=/dist/nginx-rtmp-module-${NGINXRTMP_VERSION} && \
make -j$(nproc) && \ make -j$(nproc) && \