From 4a0e53bc6f469493fa17a12fe74e6c438ce87fdd Mon Sep 17 00:00:00 2001 From: Torma Kristof Date: Sat, 19 Sep 2020 22:30:25 +0200 Subject: [PATCH] always reconfigure server --- Dockerfile | 2 +- startscript.sh | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3d0043d..6a64e15 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps:focal +FROM buildpack-deps:stable ENV NGINX_VERSION nginx-1.19.2 ENV NGINX_RTMP_MODULE_VERSION 1.2.1 diff --git a/startscript.sh b/startscript.sh index fab7088..5198138 100644 --- a/startscript.sh +++ b/startscript.sh @@ -3,11 +3,6 @@ NGINX_CONF=/etc/nginx/nginx.conf NGINX_INGEST_CONF=/etc/nginx/nginx_ingest.conf NGINX_RESTREAM_CONF=/etc/nginx/nginx_restream.conf -if test -f "$NGINX_CONF"; then - nginx -g daemon off; - exit 0 -fi - function mfcb { local val="$4"; "$1"; eval "$2[$3]=\$val;"; }; function val_ltrim { if [[ "$val" =~ ^[[:space:]]+ ]]; then val="${val:${#BASH_REMATCH[0]}}"; fi; }; function val_rtrim { if [[ "$val" =~ [[:space:]]+$ ]]; then val="${val:0:${#val}-${#BASH_REMATCH[0]}}"; fi; };