Merge pull request #102 from linuxserver/webroot

Set default webroot to /

Author: tobbenb

README.md

@@ -93,6 +93,7 @@ services:
       - PGID=1000
       - TZ=Europe/London
       - WEBROOT=domoticz #optional
+      - DBASE=<path to database> #optional
     volumes:
       - <path to data>:/config
     ports:
@@ -113,6 +114,7 @@ docker run -d \
   -e PGID=1000 \
   -e TZ=Europe/London \
   -e WEBROOT=domoticz `#optional` \
+  -e DBASE=<path to database> `#optional` \
   -p 8080:8080 \
   -p 6144:6144 \
   -p 1443:1443 \
@@ -147,6 +149,7 @@ Container images are configured using parameters passed at runtime (such as thos
 | `-e PGID=1000` | for GroupID - see below for explanation |
 | `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London. |
 | `-e WEBROOT=domoticz` | Sets webroot to domoticz for usage with subfolder reverse proxy. Not needed unless reverse proxying. |
+| `-e DBASE=<path to database>` | Sets path to database. Do not set unless you know what this does. |
 | `-v /config` | Where Domoticz stores config files and data. |
 | `--device path to device` | For passing through USB devices. |
 
@@ -259,6 +262,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **05.02.22:** - Set default webroot to /. Add env. variable for setting custom databas path.
 * **26.12.20:** - Rebase to Ubuntu Focal, see [here](https://docs.linuxserver.io/faq#my-host-is-incompatible-with-images-based-on-ubuntu-focal) for troubleshooting armhf.
 * **24.11.19:** - Change to using domoticz builtin Lua and MQTT.
 * **03.11.19:** - Set capabilities for domoticz binary and move cmake from edge repo.

readme-vars.yml

@@ -47,6 +47,7 @@ cap_add_param: false
 opt_param_usage_include_env: true
 opt_param_env_vars:
   - { env_var: "WEBROOT", env_value: "domoticz", desc: "Sets webroot to domoticz for usage with subfolder reverse proxy. Not needed unless reverse proxying." }
+  - { env_var: "DBASE", env_value: "<path to database>", desc: "Sets path to database. Do not set unless you know what this does." }
 opt_param_usage_include_vols: false
 opt_param_usage_include_ports: false
 opt_param_device_map: false
@@ -74,6 +75,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "05.02.22:", desc: "Set default webroot to /. Add env. variable for setting custom databas path." }
   - { date: "26.12.20:", desc: "Rebase to Ubuntu Focal, see [here](https://docs.linuxserver.io/faq#my-host-is-incompatible-with-images-based-on-ubuntu-focal) for troubleshooting armhf." }
   - { date: "24.11.19:", desc: "Change to using domoticz builtin Lua and MQTT." }
   - { date: "03.11.19:", desc: "Set capabilities for domoticz binary and move cmake from edge repo." }

root/etc/services.d/domoticz/run

@@ -1,14 +1,14 @@
 #!/usr/bin/with-contenv bash
 
-IFS=" " read -r -a RUN_ARRAY <<< "$WEBROOT"
+IFS=" " read -r -a RUN_ARRAY <<< "${WEBROOT:-/}"
 
 # set capabilities for domoticz binary
 setcap cap_net_raw=+eip /usr/bin/domoticz
 
 exec \
 	s6-setuidgid abc /usr/bin/domoticz \
 		-approot /usr/share/domoticz/ \
-		-dbase /config/domoticz.db \
+		-dbase "${DBASE:-/config/domoticz.db}" \
 		-noupdate \
 		-sslwww 1443 \
 		-sslcert /config/keys/server_cert.pem \