docs and some more tweaks

Dockerfile

@@ -15,9 +15,9 @@ RUN apt-get update \
     && add-apt-repository ppa:transmissionbt/ppa \
     && apt-get update \
     && apt-get install -y sudo transmission-cli transmission-common transmission-daemon curl rar unrar zip unzip wget \
-    && wget -O - https://github.com/Secretmapper/combustion/archive/release.zip \
-    && unzip release.zip ; rm *.zip \
-    && mkdir /usr/bin/transmission-daemon/combustion ; mv combustion-release/* /usr/bin/transmission-daemon/combustion \
+    && wget -O /tmp/release.zip https://github.com/Secretmapper/combustion/archive/release.zip \
+    && unzip -d /tmp /tmp/release.zip ; rm /tmp/*.zip \
+    && mkdir /usr/bin/transmission-combustion/ ; mv /tmp/combustion-release/* /usr/bin/transmission-combustion/ \
     && wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg|apt-key add - \
     && echo "deb http://build.openvpn.net/debian/openvpn/stable xenial main" > /etc/apt/sources.list.d/openvpn-aptrepo.list \
     && apt-get update \

README.md

@@ -94,6 +94,11 @@ If TRANSMISSION_PEER_PORT_RANDOM_ON_START is enabled then it allows traffic to t
 |----------|----------|-------|
 |`ENABLE_UFW` | Enables the firewall | `ENABLE_UFW=true`|
 
+### Alternative web UIs
+You can override the default web UI by setting the ```TRANSMISSION_WEB_HOME``` environment variable. If set, Transmission will look there for the Web Interface files, such as the javascript, html, and graphics files.
+
+[Combustion UI](https://github.com/Secretmapper/combustion) comes bundled with the container. You can enable it by setting ```ENABLE_COMBUSTION_UI=true```. Note that this will override the ```TRANSMISSION_WEB_HOME``` variable if set.
+
 ### Transmission configuration options
 
 You may override transmission options by setting the appropriate environment variable.

transmission/start.sh

@@ -8,6 +8,11 @@
 echo "Updating TRANSMISSION_BIND_ADDRESS_IPV4 to the ip of $1 : $4"
 export TRANSMISSION_BIND_ADDRESS_IPV4=$4
 
+if [ "true" = "$ENABLE_COMBUSTION_UI" ]; then
+  echo "Using Combustion UI, overriding TRANSMISSION_WEB_HOME"
+  export TRANSMISSION_WEB_HOME=/usr/bin/transmission-combustion
+fi
+
 echo "Generating transmission settings.json from env variables"
 # Ensure TRANSMISSION_HOME is created
 mkdir -p ${TRANSMISSION_HOME}
@@ -19,11 +24,6 @@ if [ ! -e "/dev/random" ]; then
   ln -s /dev/urandom /dev/random
 fi
 
-if [ "true" = "$ENABLE_UFW" ]; then
-  echo "Using Combustin UI, overriding TRANSMISSION_WEB_HOME"
-  export TRANSMISSION_WEB_HOME=//usr/bin/transmission-daemon/combustion
-fi
-
 . /etc/transmission/userSetup.sh
 
 echo "STARTING TRANSMISSION"