updates
This commit is contained in:
parent
711d73c9fb
commit
9d4bb2107a
20
Dockerfile
20
Dockerfile
@ -1,15 +1,15 @@
|
||||
ARG RESTY_IMAGE_BASE="alpine"
|
||||
ARG RESTY_IMAGE_TAG="3.18"
|
||||
ARG FFMPEG_VERSION=4.4
|
||||
ARG RESTY_IMAGE_TAG="3.22.1"
|
||||
ARG FFMPEG_VERSION=4.4.6
|
||||
|
||||
##############################
|
||||
# Build the OpenResty-build image.
|
||||
# mostly from https://github.com/openresty/docker-openresty/blob/master/alpine/Dockerfile
|
||||
FROM ${RESTY_IMAGE_BASE}:${RESTY_IMAGE_TAG} as build-openresty
|
||||
FROM ${RESTY_IMAGE_BASE}:${RESTY_IMAGE_TAG} AS build-openresty
|
||||
|
||||
ARG RESTY_IMAGE_BASE
|
||||
ARG RESTY_IMAGE_TAG
|
||||
ARG RESTY_VERSION="1.19.9.1"
|
||||
ARG RESTY_VERSION="1.27.1.2"
|
||||
ARG RESTY_OPENSSL_VERSION="1.1.1l"
|
||||
ARG RESTY_OPENSSL_PATCH_VERSION="1.1.1f"
|
||||
ARG RESTY_OPENSSL_URL_BASE="https://www.openssl.org/source"
|
||||
@ -162,7 +162,7 @@ RUN cd /tmp \
|
||||
|
||||
###############################
|
||||
# Build the FFmpeg-build image.
|
||||
FROM ${RESTY_IMAGE_BASE}:${RESTY_IMAGE_TAG} as build-ffmpeg
|
||||
FROM ${RESTY_IMAGE_BASE}:${RESTY_IMAGE_TAG} AS build-ffmpeg
|
||||
ARG FFMPEG_VERSION
|
||||
ARG PREFIX=/usr/local
|
||||
ARG MAKEFLAGS="-j4"
|
||||
@ -232,9 +232,9 @@ RUN rm -rf /var/cache/* /tmp/*
|
||||
|
||||
######################################
|
||||
# Create FAT version of openresty-rtmp
|
||||
FROM build-openresty as build-openresty-fat
|
||||
FROM build-openresty AS build-openresty-fat
|
||||
|
||||
ARG RESTY_LUAROCKS_VERSION="3.8.0"
|
||||
ARG RESTY_LUAROCKS_VERSION="3.12.2"
|
||||
|
||||
RUN apk add --no-cache --virtual .build-deps \
|
||||
perl-dev \
|
||||
@ -249,6 +249,7 @@ RUN apk add --no-cache --virtual .build-deps \
|
||||
outils-md5 \
|
||||
perl \
|
||||
unzip \
|
||||
wget \
|
||||
&& cd /tmp \
|
||||
&& curl -fSL https://luarocks.github.io/luarocks/releases/luarocks-${RESTY_LUAROCKS_VERSION}.tar.gz -o luarocks-${RESTY_LUAROCKS_VERSION}.tar.gz \
|
||||
&& tar xzf luarocks-${RESTY_LUAROCKS_VERSION}.tar.gz \
|
||||
@ -278,7 +279,7 @@ ENV PATH="/usr/local/openresty/bin:/usr/local/openresty/luajit/bin:$PATH"
|
||||
|
||||
ENV LAPIS_VERSION=1.16.0
|
||||
|
||||
RUN apk add openssl-dev curl
|
||||
RUN apk add openssl-dev curl git
|
||||
RUN opm get spacewander/luafilesystem
|
||||
RUN luarocks install luasec
|
||||
RUN luarocks install busted
|
||||
@ -289,7 +290,7 @@ RUN luarocks install moonscript
|
||||
|
||||
##########################
|
||||
# Build the release image.
|
||||
FROM ${RESTY_IMAGE_BASE}:${RESTY_IMAGE_TAG} as openresty-rtmp
|
||||
FROM ${RESTY_IMAGE_BASE}:${RESTY_IMAGE_TAG} AS openresty-rtmp
|
||||
LABEL MAINTAINER dreamer <dreamer@puikheid.nl>
|
||||
|
||||
# Set default ports.
|
||||
@ -311,6 +312,7 @@ RUN apk add --update \
|
||||
libvpx \
|
||||
libvorbis \
|
||||
libwebp \
|
||||
libwebpmux \
|
||||
libtheora \
|
||||
opus \
|
||||
rtmpdump \
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
version: "3.3"
|
||||
services:
|
||||
puikheid:
|
||||
environment:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user