[Maintenance] Remove defaults for UPNPAV and OPENHOME from Dockerfile #…

…131 (#132)

Dockerfile

@@ -55,8 +55,8 @@ ENV AV_FRIENDLY_NAME ""
 ENV FRIENDLY_NAME ""
 
 ENV RENDERER_MODE ""
-ENV UPNPAV 0
-ENV OPENHOME 1
+ENV UPNPAV ""
+ENV OPENHOME ""
 
 ENV UPNPAV_SKIP_NAME_POSTFIX ""
 

README.md

@@ -99,8 +99,8 @@ UPMPD_FRIENDLY_NAME|upmpd|Name of the upnp renderer
 AV_FRIENDLY_NAME|upmpd-av|Name of the upnp renderer (av mode)
 FRIENDLY_NAME||Name of the renderer, overrides `UPMPD_FRIENDLY_NAME`, `AV_FRIENDLY_NAME` and `MEDIA_SERVER_FRIENDLY_NAME`. The variable `AV_FRIENDLY_NAME` is appended with the postfix `-av`, unless UPNPAV is the only enabled renderer. See `UPNPAV_SKIP_NAME_POSTFIX` for more details.
 RENDERER_MODE||If set, this variable overrides `UPNPAV` and `OPENHOME`. Possible values are `NONE`, `OPENHOME`, `UPNPAV` and `BOTH`
-UPNPAV|0|Enable UPnP AV services (`0`/`1`)
-OPENHOME|1|Enable OpenHome services (`0`/`1`)
+UPNPAV||Enable UPnP AV services (`0`/`1`), defaults to `0`
+OPENHOME||Enable OpenHome services (`0`/`1`), defaults to `1`
 UPNPAV_SKIP_NAME_POSTFIX||If not set or set to `yes`, and if only `UPNPAV` renderer is enabled, the `-av` postfix is not appended to `FRIENDLY_NAME`
 UPRCL_ENABLE||Enable local music support (uprcl). Set to `yes` to enable
 RADIO_BROWSER_ENABLE||Enable the Radio Browser plugin. Set to `yes` to enable
@@ -178,6 +178,7 @@ Just be careful to use the tag you have built.
 
 Change Date|Major Changes
 ---|---
+2023-02-27|Removed defaults for `UPNPAV` and `OPENHOME` from Dockerfile
 2023-02-26|Add support for Radio Browser (`RADIO_BROWSER_ENABLE`)
 2023-02-25|Renamed ENABLE_UPRCL to UPRCL_ENABLE
 2023-02-25|Update to Upmpdcli version 1.7.2

app/bin/run-upmpdcli.sh

@@ -18,6 +18,17 @@ source read-file.sh
 source get-value.sh
 source config-builder.sh
 
+DEFAULT_UPNPAV=0
+DEFAULT_OPENHOME=1
+
+if [[ -z "$UPNPAV" ]]; then
+    UPNPAV=$DEFAULT_UPNPAV
+fi
+
+if [[ -z "$OPENHOME" ]]; then
+    OPENHOME=$DEFAULT_OPENHOME
+fi
+
 if [[ -n $ENABLE_UPRCL ]]; then
     echo "ENABLE_UPRCL is deprecated, use UPRCL_ENABLE instead"
     if [[ -z "$UPRCL_ENABLE" ]]; then