diff --git a/plugins/nginx-vhosts/docker-args-process-deploy b/plugins/nginx-vhosts/docker-args-process-deploy index a20e10819..78b06cb98 100755 --- a/plugins/nginx-vhosts/docker-args-process-deploy +++ b/plugins/nginx-vhosts/docker-args-process-deploy @@ -30,27 +30,48 @@ trigger-nginx-vhosts-docker-args-process-deploy() { # ensure we have a port mapping plugn trigger ports-configure "$APP" - output="$output '--label=nginx.access-log-format=$(fn-nginx-access-log-format "$APP")'" - output="$output '--label=nginx.bind-address-ipv4=$(fn-nginx-bind-address-ipv4 "$APP")'" - output="$output '--label=nginx.bind-address-ipv6=$(fn-nginx-bind-address-ipv6 "$APP")'" - output="$output '--label=nginx.client-max-body-size=$(fn-nginx-client-max-body-size "$APP")'" - output="$output '--label=nginx.hsts-include-subdomains=$(fn-nginx-hsts-include-subdomains "$APP")'" - output="$output '--label=nginx.hsts-max-age=$(fn-nginx-hsts-max-age "$APP")'" - output="$output '--label=nginx.hsts-preload=$(fn-nginx-hsts-preload "$APP")'" - output="$output '--label=nginx.hsts=$(fn-nginx-hsts-is-enabled "$APP")'" - output="$output '--label=nginx.https-port=443'" - output="$output '--label=nginx.domains=$(plugn trigger domains-list "$APP" | xargs)'" - output="$output '--label=nginx.initial-network=$(plugn trigger network-get-property "$APP" initial-network)'" - output="$output '--label=nginx.port-mapping=$(plugn trigger ports-get "$APP" | xargs)'" - output="$output '--label=nginx.proxy-buffer-size=$(fn-nginx-proxy-buffer-size "$APP")'" - output="$output '--label=nginx.proxy-buffering=$(fn-nginx-proxy-buffering "$APP")'" - output="$output '--label=nginx.proxy-buffers=$(fn-nginx-proxy-buffers "$APP")'" - output="$output '--label=nginx.proxy-busy-buffer-size=$(fn-nginx-proxy-busy-buffers-size "$APP")'" - output="$output '--label=nginx.proxy-read-timeout=$(fn-nginx-proxy-read-timeout "$APP")'" - output="$output '--label=nginx.x-forwarded-for-value=$(fn-nginx-x-forwarded-for-value "$APP")'" - output="$output '--label=nginx.x-forwarded-port-value=$(fn-nginx-x-forwarded-port-value "$APP")'" - output="$output '--label=nginx.x-forwarded-proto-value=$(fn-nginx-x-forwarded-proto-value "$APP")'" - output="$output '--label=nginx.x-forwarded-ssl=$(fn-nginx-x-forwarded-ssl "$APP")'" + value="$(fn-nginx-access-log-format "$APP")" + [[ -n "$value" ]] && output="$output '--label=nginx.access-log-format=$value'" + value="$(fn-nginx-bind-address-ipv4 "$APP")" + [[ -n "$value" ]] && output="$output '--label=nginx.bind-address-ipv4=$value'" + value="$(fn-nginx-bind-address-ipv6 "$APP")" + [[ -n "$value" ]] && output="$output '--label=nginx.bind-address-ipv6=$value'" + value="$(fn-nginx-client-max-body-size "$APP")" + [[ -n "$value" ]] && output="$output '--label=nginx.client-max-body-size=$value'" + value="$(fn-nginx-hsts-include-subdomains "$APP")" + [[ -n "$value" ]] && output="$output '--label=nginx.hsts-include-subdomains=$value'" + value="$(fn-nginx-hsts-max-age "$APP")" + [[ -n "$value" ]] && output="$output '--label=nginx.hsts-max-age=$value'" + value="$(fn-nginx-hsts-preload "$APP")" + [[ -n "$value" ]] && output="$output '--label=nginx.hsts-preload=$value'" + value="$(fn-nginx-hsts-is-enabled "$APP")" + [[ -n "$value" ]] && output="$output '--label=nginx.hsts=$value'" + value="443" + [[ -n "$value" ]] && output="$output '--label=nginx.https-port=$value'" + value="$(plugn trigger domains-list "$APP" | xargs)" + [[ -n "$value" ]] && output="$output '--label=nginx.domains=$value'" + value="$(plugn trigger network-get-property "$APP" initial-network)" + [[ -n "$value" ]] && output="$output '--label=nginx.initial-network=$value'" + value="$(plugn trigger ports-get "$APP" | xargs)" + [[ -n "$value" ]] && output="$output '--label=nginx.port-mapping=$value'" + value="$(fn-nginx-proxy-buffer-size "$APP")" + [[ -n "$value" ]] && output="$output '--label=nginx.proxy-buffer-size=$value'" + value="$(fn-nginx-proxy-buffering "$APP")" + [[ -n "$value" ]] && output="$output '--label=nginx.proxy-buffering=$value'" + value="$(fn-nginx-proxy-buffers "$APP")" + [[ -n "$value" ]] && output="$output '--label=nginx.proxy-buffers=$value'" + value="$(fn-nginx-proxy-busy-buffers-size "$APP")" + [[ -n "$value" ]] && output="$output '--label=nginx.proxy-busy-buffer-size=$value'" + value="$(fn-nginx-proxy-read-timeout "$APP")" + [[ -n "$value" ]] && output="$output '--label=nginx.proxy-read-timeout=$value'" + value="$(fn-nginx-x-forwarded-for-value "$APP")" + [[ -n "$value" ]] && output="$output '--label=nginx.x-forwarded-for-value=$value'" + value="$(fn-nginx-x-forwarded-port-value "$APP")" + [[ -n "$value" ]] && output="$output '--label=nginx.x-forwarded-port-value=$value'" + value="$(fn-nginx-x-forwarded-proto-value "$APP")" + [[ -n "$value" ]] && output="$output '--label=nginx.x-forwarded-proto-value=$value'" + value="$(fn-nginx-x-forwarded-ssl "$APP")" + [[ -n "$value" ]] && output="$output '--label=nginx.x-forwarded-ssl=$value'" echo -n "$STDIN$output" }