Merge branch 'zlib_fix' into 'master'

ZLib Fixes to 0.9.6 See merge request osp-group/flask-nginx-rtmp-manager!375
andrewfer000 · Oct 24, 2022 · b10ae49 · b10ae49
2 parents 2fd0b61 + 68b896d
commit b10ae49
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/installs/docker/OSP-Core/Dockerfile b/installs/docker/OSP-Core/Dockerfile
@@ -6,7 +6,7 @@ ARG OSP_GIT_BRANCH=build/0.9.x
 
 ARG NGINX_VERSION=1.22.0
 ARG NGINX_RTMP_VERSION=1.2.10
-ARG NGINX_ZLIB_VERSION=1.2.12
+ARG NGINX_ZLIB_VERSION=1.2.13
 
 ARG DEFAULT_DB_URL=mysql+pymysql:https://osp:password@db/osp?charset=utf8mb4
 ARG DEFAULT_REDIS_HOST=redis

diff --git a/installs/docker/OSP-Edge/Dockerfile b/installs/docker/OSP-Edge/Dockerfile
@@ -5,7 +5,7 @@ ARG OSP_VERSION="0.9.0"
 
 ARG NGINX_VERSION=1.22.0
 ARG NGINX_RTMP_VERSION=1.2.1
-ARG NGINX_ZLIB_VERSION=1.2.12
+ARG NGINX_ZLIB_VERSION=1.2.13
 
 ARG DEFAULT_COREIP="127.0.0.1"
 ARG DEFAULT_RTMPIP="127.0.0.1"

diff --git a/installs/docker/OSP-RTMP/Dockerfile b/installs/docker/OSP-RTMP/Dockerfile
@@ -6,7 +6,7 @@ ARG OSP_GIT_BRANCH=build/0.9.x
 
 ARG NGINX_VERSION=1.22.0
 ARG NGINX_RTMP_VERSION=1.2.10
-ARG NGINX_ZLIB_VERSION=1.2.12
+ARG NGINX_ZLIB_VERSION=1.2.13
 
 ARG DEFAULT_API=https://127.0.0.1:5010
 ARG DEFAULT_FLASK_SECRET=CHANGEME

diff --git a/osp-config.sh b/osp-config.sh
@@ -6,7 +6,7 @@ VERSION=$(<version)
 
 NGINX_BUILD_VERSION=1.22.0
 NGINX_RTMP_VERSION=1.2.10
-NGINX_ZLIB_VERSION=1.2.12
+NGINX_ZLIB_VERSION=1.2.13
 EJABBERD_VERSION=20.12
 
 DIALOG_CANCEL=1