Clearer naming for auto proxy related ENVs

Prefix insert/tld ENVs with AUTO_PROXY to make it clear they are related to this mod

Author: FoxxMD

README.md

@@ -61,7 +61,7 @@ DOCKER_HOST=192.168.0.100:2375|serverA,192.168.0.110:2375|serverB|local.test,192
 When using a remote docker host from `DOCKER_HOST` auto-proxy assumes the detected containers are not on the same network as SWAG:
 
 * If the detected containers do not have the `swag_address` label set then the Host IP will be used.
-* If the detected containers do not have the `swag_port` label set then auto-proxy attempts to find a mapped **host port** on the container and will use it based on **container port** in this order:
+* If the detected containers do not have the `swag_port` label set then auto-proxy looks for exposed **container ports** and uses the corresponding **host port** as the upstream port. Container ports are checked in this order:
   * 80
   * 8080
   * The first mapped port, if any
@@ -70,29 +70,29 @@ When using a remote docker host from `DOCKER_HOST` auto-proxy assumes the detect
 
 If a detected container does not have the `swag_url` label set then the subdomain and TLD can be programmatically generated.
 
-The default TLD used in nginx [`server_name` directive](https://nginx.org/en/docs/http/server_names.html) can be set using `HOST_TLD`. This can also be set per-host using the syntax described in [`DOCKER_HOST` for `default_tld`.](#multiple-hosts)
+The default TLD used in nginx [`server_name` directive](https://nginx.org/en/docs/http/server_names.html) can be set using `AUTO_PROXY_HOST_TLD`. This can also be set per-host using the syntax described in [`DOCKER_HOST` for `default_tld`.](#multiple-hosts)
 
-The subdomain used for a container can optionally be modified to include the Host's `friendly_name` described in the `DOCKER_HOST` syntax by setting `HOST_INSERT` to either `prefix` or `suffix`
+The subdomain used for a container can optionally be modified to include the Host's `friendly_name` described in the `DOCKER_HOST` syntax by setting `AUTO_PROXY_HOST_INSERT` to either `prefix` or `suffix`
 
 Examples using a container named `overseer`:
 
-* Using only HOST_INSERT to modify subdomain
+* Using only AUTO_PROXY_HOST_INSERT to modify subdomain
   * `DOCKER_HOST=192.168.0.100:2375|serverA`
-  * `HOST_TLD` (not set, defaults to `*`)
-  * `HOST_INSERT`
+  * `AUTO_PROXY_HOST_TLD` (not set, defaults to `*`)
+  * `AUTO_PROXY_HOST_INSERT`
     * (unset) => nginx `server_name overseer.*`
     * `prefix` => nginx `server_name serverA-overseer.*`
     * `suffix` => nginx `server_name overseer-serverA.*`
-* Using HOST_INSERT prefix and HOST_TLD
+* Using AUTO_PROXY_HOST_INSERT prefix and AUTO_PROXY_HOST_TLD
   * `DOCKER_HOST=192.168.0.100:2375|serverA`
-  * `HOST_TLD=test.home`
-  * `HOST_INSERT=prefix`
+  * `AUTO_PROXY_HOST_TLD=test.home`
+  * `AUTO_PROXY_HOST_INSERT=prefix`
     * `server_name serverA-overseer.test.home`
-* Using HOST_INSERT prefix and default_tld
+* Using AUTO_PROXY_HOST_INSERT prefix and default_tld
   * `DOCKER_HOST=192.168.0.100:2375|serverA|myserver.home`
-  * `HOST_INSERT=prefix`
+  * `AUTO_PROXY_HOST_INSERT=prefix`
     * `server_name serverA-overseer.myserver.home`
-* Using HOST_TLD only
+* Using AUTO_PROXY_HOST_TLD only
   * `DOCKER_HOST=192.168.0.100:2375`
-  * `HOST_TLD=myserver.home`
+  * `AUTO_PROXY_HOST_TLD=myserver.home`
     * `server_name overseer.myserver.home`

root/app/auto-proxy.sh

@@ -138,7 +138,6 @@ DUDE
               else
                 echo "**** No exposed ports found for ${CONTAINER_ID}. Setting reverse proxy port to 80. ****"
                 swag_port="80"
-               swag_address="${UPSTREAM_HOST}"
               fi
             else
               swag_port=$(docker inspect ${CONTAINER} | jq -r '.[0].NetworkSettings.Ports | keys[0]' | sed 's|/.*||')
@@ -156,12 +155,12 @@ DUDE
         sed -i "s|set \$upstream_proto .*|set \$upstream_proto ${swag_proto};|g" "/etc/nginx/http.d/auto-proxy-${CONTAINER_ID}.subdomain.conf"
         echo "**** Setting proto ${swag_proto} for ${CONTAINER_ID} ****"
         if [ -z "${swag_url}" ]; then
-            if [ "$HOST_INSERT" == "suffix" ]; then
-              swag_url="${CONTAINER}-${DOCKER_HOST_NAME}.${HOST_TLD}"
-            elif [ "$HOST_INSERT" == "prefix" ]; then
-              swag_url="${DOCKER_HOST_NAME}-${CONTAINER}.${HOST_TLD}"
+            if [ "$AUTO_PROXY_HOST_INSERT" == "suffix" ]; then
+              swag_url="${CONTAINER}-${DOCKER_HOST_NAME}.${AUTO_PROXY_HOST_TLD}"
+            elif [ "$AUTO_PROXY_HOST_INSERT" == "prefix" ]; then
+              swag_url="${DOCKER_HOST_NAME}-${CONTAINER}.${AUTO_PROXY_HOST_TLD}"
             else
-              swag_url="${CONTAINER}.${HOST_TLD}"
+              swag_url="${CONTAINER}.${AUTO_PROXY_HOST_TLD}"
             fi
         fi
         sed -i "s|server_name .*|server_name ${swag_url};|" "/etc/nginx/http.d/auto-proxy-${CONTAINER_ID}.subdomain.conf"

root/app/docker-wrap.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bash
 
-HOST_TLD_ORIG=${HOST_TLD:=*}
+HOST_TLD_ORIG=${AUTO_PROXY_HOST_TLD:=*}
 if [[ -v FIRST_RUN ]];then
   echo '**** Auto Proxy - first-run ****'
 fi
@@ -20,17 +20,17 @@ if [[ -v DOCKER_HOST ]];then
     fi
 
     if [[ -v arrIN[2] ]];then
-      HOST_TLD=${arrIN[2]}
+      AUTO_PROXY_HOST_TLD=${arrIN[2]}
     else
-      HOST_TLD=$HOST_TLD_ORIG
+      AUTO_PROXY_HOST_TLD=$HOST_TLD_ORIG
     fi
 
     # get default upstream ip
     HOST_PARTS=(${DOCKER_HOST//:/ })
     UPSTREAM_HOST="${HOST_PARTS[0]}"
 
     if [[ -v FIRST_RUN ]];then
-      echo "**** Auto Proxy - Generating proxies for => Host: ${DOCKER_HOST} | Name: ${DOCKER_HOST_NAME:-N/A} | Default Upstream IP: ${UPSTREAM_HOST} | Host TLD: ${HOST_TLD} ****"
+      echo "**** Auto Proxy - Generating proxies for => Host: ${DOCKER_HOST} | Name: ${DOCKER_HOST_NAME:-N/A} | Default Upstream IP: ${UPSTREAM_HOST} | Host TLD: ${AUTO_PROXY_HOST_TLD} ****"
     fi
     . /app/auto-proxy.sh
 
@@ -40,7 +40,7 @@ fi
 
 if [ -S /var/run/docker.sock ]; then
   if [[ -v FIRST_RUN ]];then
-    echo "**** Auto Proxy - Detected docker.sock, generating proxies for => Host: Local | Name: Local | Default Upstream IP: N/A | Host TLD: ${HOST_TLD} ****"
+    echo "**** Auto Proxy - Detected docker.sock, generating proxies for => Host: Local | Name: Local | Default Upstream IP: N/A | Host TLD: ${AUTO_PROXY_HOST_TLD} ****"
   fi
   DOCKER_HOST_NAME="local"
   unset DOCKER_HOST