Fixed Receiving Malformed URI error on startup (docker-drawio-125)

Author: m-mohamedin

main/docker-entrypoint.sh

@@ -29,14 +29,14 @@ if [[ "${DRAWIO_SELF_CONTAINED}" ]]; then
 elif [[ "${EXPORT_URL}" ]]; then
     echo "window.EXPORT_URL = '/service/0';" >> $CATALINA_HOME/webapps/draw/js/PreConfig.js
 fi
-#DRAWIO_SERVER_URL is the new URL of the deployment, e.g. https://www.example.com/drawio
+#DRAWIO_SERVER_URL is the new URL of the deployment, e.g. https://www.example.com/drawio/
 #DRAWIO_BASE_URL is still used by viewer, lightbox and embed. For backwards compatibility, DRAWIO_SERVER_URL is set to DRAWIO_BASE_URL if not specified.
 if [[ "${DRAWIO_SERVER_URL}" ]]; then
     echo "window.DRAWIO_SERVER_URL = '${DRAWIO_SERVER_URL}';" >> $CATALINA_HOME/webapps/draw/js/PreConfig.js
-    echo "window.DRAWIO_BASE_URL = '${DRAWIO_BASE_URL:-${DRAWIO_SERVER_URL}}';" >> $CATALINA_HOME/webapps/draw/js/PreConfig.js
+    echo "window.DRAWIO_BASE_URL = '${DRAWIO_BASE_URL:-${DRAWIO_SERVER_URL:0:$((${#DRAWIO_SERVER_URL}-1))}}';" >> $CATALINA_HOME/webapps/draw/js/PreConfig.js
 else
     echo "window.DRAWIO_BASE_URL = '${DRAWIO_BASE_URL:-http://localhost:8080}';" >> $CATALINA_HOME/webapps/draw/js/PreConfig.js
-    echo "window.DRAWIO_SERVER_URL = window.DRAWIO_BASE_URL;" >> $CATALINA_HOME/webapps/draw/js/PreConfig.js
+    echo "window.DRAWIO_SERVER_URL = window.DRAWIO_BASE_URL + '/';" >> $CATALINA_HOME/webapps/draw/js/PreConfig.js
 fi
 #DRAWIO_VIEWER_URL is path to the viewer js, e.g. https://www.example.com/js/viewer.min.js
 echo "window.DRAWIO_VIEWER_URL = '${DRAWIO_VIEWER_URL}';" >> $CATALINA_HOME/webapps/draw/js/PreConfig.js

self-contained/README.md

@@ -10,8 +10,8 @@ The best option for Windows users is to copy the contents of `Windowsdrive:/Wind
 
 You can customize the application by setting the following environment variables.
 
-* `DRAWIO_SERVER_URL`: Your deployment base URL. For example, `https://drawio.example.com` or `https://www.example.com/drawio` if it is deployed into a folder.
-* `DRAWIO_BASE_URL`: Your deployment base URL but used with the viewer, lightbox and embed. Usually the same as `DRAWIO_SERVER_URL`.
+* `DRAWIO_SERVER_URL`: Your deployment base URL. For example, `https://drawio.example.com/` or `https://www.example.com/drawio/` if it is deployed into a folder. **Note**: Must end with `/`
+* `DRAWIO_BASE_URL`: Your deployment base URL but used with the viewer, lightbox and embed. Usually the same as `DRAWIO_SERVER_URL` but does **not** end with `/`.
 * `DRAWIO_CSP_HEADER`: (Optional) Your website Content-Security-Policy if you want to customize it.
 * `DRAWIO_VIEWER_URL`: (Optional) If you want to host a draw.io viewer also, set the viewer URL. For example, `https://drawio.example.com/js/viewer.min.js`
 * `DRAWIO_LIGHTBOX_URL`: (Optional) If you want to host a draw.io viewer also, set the lightbox URL. For example, `https://drawio.example.com`