From 4c12b907d0c4f44405eab70812bb91461975cf35 Mon Sep 17 00:00:00 2001
From: Alex <dreamer@drmr.nl>
Date: Fri, 11 Mar 2022 22:50:19 +0100
Subject: [PATCH] update packages

---
 Dockerfile               | 46 +++++++++++++++++++++++++++++-----------
 docker-compose-local.yml |  2 +-
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 67ec5a4..e907a35 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 ARG RESTY_IMAGE_BASE="alpine"
-ARG RESTY_IMAGE_TAG="3.13"
+ARG RESTY_IMAGE_TAG="3.15"
 ARG FFMPEG_VERSION=4.4
 
 ##############################
@@ -9,11 +9,12 @@ FROM ${RESTY_IMAGE_BASE}:${RESTY_IMAGE_TAG} as build-openresty
 
 ARG RESTY_IMAGE_BASE
 ARG RESTY_IMAGE_TAG
-ARG RESTY_VERSION="1.19.3.1"
-ARG RESTY_OPENSSL_VERSION="1.1.1k"
+ARG RESTY_VERSION="1.19.9.1"
+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"
 ARG RESTY_PCRE_VERSION="8.44"
+ARG RESTY_PCRE_SHA256="aecafd4af3bd0f3935721af77b889d9024b2e01d96b58471bd91a3063fb47728"
 ARG RESTY_J="4"
 ARG RESTY_CONFIG_OPTIONS="\
     --with-compat \
@@ -54,14 +55,34 @@ ARG RESTY_ADD_PACKAGE_RUNDEPS=""
 ARG RESTY_EVAL_PRE_CONFIGURE=""
 ARG RESTY_EVAL_POST_MAKE=""
 
-ARG NGINX_RTMP_VERSION=1.2.1
+#ARG NGINX_RTMP_VERSION=v1.2.2
+ARG NGINX_RTMP_VERSION=on_publish_targets
 
 # These are not intended to be user-specified
+# We add rtmp module to nginx build here
 ARG _RESTY_CONFIG_DEPS="--add-module=/tmp/nginx-rtmp-module-${NGINX_RTMP_VERSION} --with-pcre \
     --with-cc-opt='-DNGX_LUA_ABORT_AT_PANIC -I/usr/local/openresty/pcre/include -I/usr/local/openresty/openssl/include' \
     --with-ld-opt='-L/usr/local/openresty/pcre/lib -L/usr/local/openresty/openssl/lib -Wl,-rpath,/usr/local/openresty/pcre/lib:/usr/local/openresty/openssl/lib' \
     "
 
+LABEL resty_image_base="${RESTY_IMAGE_BASE}"
+LABEL resty_image_tag="${RESTY_IMAGE_TAG}"
+LABEL resty_version="${RESTY_VERSION}"
+LABEL resty_openssl_version="${RESTY_OPENSSL_VERSION}"
+LABEL resty_openssl_patch_version="${RESTY_OPENSSL_PATCH_VERSION}"
+LABEL resty_openssl_url_base="${RESTY_OPENSSL_URL_BASE}"
+LABEL resty_pcre_version="${RESTY_PCRE_VERSION}"
+LABEL resty_pcre_sha256="${RESTY_PCRE_SHA256}"
+LABEL resty_config_options="${RESTY_CONFIG_OPTIONS}"
+LABEL resty_config_options_more="${RESTY_CONFIG_OPTIONS_MORE}"
+LABEL resty_config_deps="${_RESTY_CONFIG_DEPS}"
+LABEL resty_add_package_builddeps="${RESTY_ADD_PACKAGE_BUILDDEPS}"
+LABEL resty_add_package_rundeps="${RESTY_ADD_PACKAGE_RUNDEPS}"
+LABEL resty_eval_pre_configure="${RESTY_EVAL_PRE_CONFIGURE}"
+LABEL resty_eval_post_make="${RESTY_EVAL_POST_MAKE}"
+
+LABEL nginx_rtmp_version="${NGINX_RTMP_VERSION}"
+
 
 # Build dependencies.
 RUN apk add --update \
@@ -69,18 +90,18 @@ RUN apk add --update \
   coreutils \
   ca-certificates \
   curl \
+  gd-dev \
+  geoip-dev \
+  libxslt-dev \
   linux-headers \
   libc-dev \
   libgcc \
+  make \
   musl-dev \
   pcre-dev \
   zlib-dev \
   perl-dev \
-  gd-dev \
-  geoip-dev \
-  libxslt-dev \
   gcc \
-  make \
   pkgconf \
   pkgconfig
 
@@ -111,7 +132,7 @@ RUN cd /tmp \
 
 # get and build pcre source
 RUN cd /tmp \
-    && curl -fSL https://ftp.pcre.org/pub/pcre/pcre-${RESTY_PCRE_VERSION}.tar.gz -o pcre-${RESTY_PCRE_VERSION}.tar.gz \
+    && curl -fSL https://downloads.sourceforge.net/project/pcre/pcre/${RESTY_PCRE_VERSION}/pcre-${RESTY_PCRE_VERSION}.tar.gz -o pcre-${RESTY_PCRE_VERSION}.tar.gz \
     && tar xzf pcre-${RESTY_PCRE_VERSION}.tar.gz && rm pcre-${RESTY_PCRE_VERSION}.tar.gz \
     && cd /tmp/pcre-${RESTY_PCRE_VERSION} \
     && ./configure \
@@ -125,8 +146,9 @@ RUN cd /tmp \
 
 # Get nginx-rtmp module.
 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
+  #&& wget https://github.com/arut/nginx-rtmp-module/archive/v${NGINX_RTMP_VERSION}.tar.gz \
+  && wget https://github.com/puikheid/nginx-rtmp-module/archive/refs/tags/${NGINX_RTMP_VERSION}.tar.gz \
+  && tar zxf ${NGINX_RTMP_VERSION}.tar.gz && rm ${NGINX_RTMP_VERSION}.tar.gz
 
 # get and build openresty source
 RUN cd /tmp \
@@ -254,7 +276,7 @@ ENV LUA_CPATH="/usr/local/openresty/site/lualib/?.so;/usr/local/openresty/lualib
 
 ENV PATH="/usr/local/openresty/bin:/usr/local/openresty/luajit/bin:$PATH"
 
-ENV LAPIS_VERSION=1.8.3
+ENV LAPIS_VERSION=1.9.0
 
 RUN apk add openssl-dev
 RUN opm get spacewander/luafilesystem
diff --git a/docker-compose-local.yml b/docker-compose-local.yml
index ef64ecd..a31d40d 100644
--- a/docker-compose-local.yml
+++ b/docker-compose-local.yml
@@ -1,6 +1,6 @@
 version: "3.3"
 services:
-  wasted.audio:
+  puikheid:
     build: .
     networks:
       - web