docker: Rename OPENGROK_WEBAPP_CONTEXT to URL_ROOT

The original OPENGROK_WEBAPP_CONTEXT variable has been
deprecated/not been in use since the deployment scripts have
been rewritten in commit d5cc7b5.

Rename the variable to URL_ROOT to avoid confusion and to
keep the docker command a bit shorter.

While we're at it, remove the OPENGROK_TOMCAT_BASE variable,
which has been deprecated at the same time.

Author: timschumi

Dockerfile

@@ -58,8 +58,7 @@ RUN python3 -m pip install /opengrok/tools/opengrok-tools*
 # environment variables
 ENV SRC_ROOT /opengrok/src
 ENV DATA_ROOT /opengrok/data
-ENV OPENGROK_WEBAPP_CONTEXT /
-ENV OPENGROK_TOMCAT_BASE /usr/local/tomcat
+ENV URL_ROOT /
 ENV CATALINA_HOME /usr/local/tomcat
 ENV CATALINA_BASE /usr/local/tomcat
 ENV CATALINA_TMPDIR /usr/local/tomcat/temp

docker/README.md

@@ -75,7 +75,7 @@ The volume mounted to `/opengrok/src` should contain the projects you want to ma
 `REINDEX: <time_in_minutes>`<br/> *Optional* *Default: 10* | Period of automatic mirroring/reindexing. Setting to `0` will disable automatic indexing. You can manually trigger an reindex using docker exec: `docker exec <container> /scripts/index.sh`
 `INDEXER_OPT` | pass extra options to opengrok-indexer. For example, "-i d:vendor" will remove all the `*/vendor/*` files from the index. You can check the indexer options on https://github.com/oracle/opengrok/wiki/Python-scripts-transition-guide
 `NOMIRROR` | To avoid the mirroring step, set the variable to non-empty value.
-`OPENGROK_WEBAPP_CONTEXT`<br/> *Default: /* | Override the sub-URL that OpenGrok should run on.
+`URL_ROOT`<br/> *Default: /* | Override the sub-URL that OpenGrok should run on.
 
 To specify environment variable for `docker run`, use the `-e` option, e.g. `-e REINDEX=30`
 

docker/index.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 LOCKFILE=/var/run/opengrok-indexer
-URI="http://localhost:8080/${OPENGROK_WEBAPP_CONTEXT#/}"
+URI="http://localhost:8080/${URL_ROOT#/}"
 # $OPS can be overwritten by environment variable
 OPS=${INDEXER_FLAGS:='-H -P -S -G'}
 

docker/start.sh

@@ -5,19 +5,19 @@ if [ -z "$REINDEX" ]; then
 	REINDEX=10
 fi
 
-if [[ "${OPENGROK_WEBAPP_CONTEXT}" = *" "* ]]; then
+if [[ "${URL_ROOT}" = *" "* ]]; then
 	date +"%F %T Deployment path contains spaces. Deploying to root..."
-	export OPENGROK_WEBAPP_CONTEXT="/"
+	export URL_ROOT="/"
 fi
 
 # Remove leading and trailing slashes
-OPENGROK_WEBAPP_CONTEXT="${OPENGROK_WEBAPP_CONTEXT#/}"
-OPENGROK_WEBAPP_CONTEXT="${OPENGROK_WEBAPP_CONTEXT%/}"
+URL_ROOT="${URL_ROOT#/}"
+URL_ROOT="${URL_ROOT%/}"
 
-if [ "${OPENGROK_WEBAPP_CONTEXT}" = "" ]; then
+if [ "${URL_ROOT}" = "" ]; then
 	WAR_NAME="ROOT.war"
 else
-	WAR_NAME="${OPENGROK_WEBAPP_CONTEXT//\//#}.war"
+	WAR_NAME="${URL_ROOT//\//#}.war"
 fi
 
 if [ ! -f "/usr/local/tomcat/webapps/${WAR_NAME}" ]; then
@@ -30,13 +30,13 @@ if [ ! -f "/usr/local/tomcat/webapps/${WAR_NAME}" ]; then
 
 	# Set up redirect from /source
 	mkdir "/usr/local/tomcat/webapps/source"
-	echo "<% response.sendRedirect(\"/${OPENGROK_WEBAPP_CONTEXT}\"); %>" > "/usr/local/tomcat/webapps/source/index.jsp"
+	echo "<% response.sendRedirect(\"/${URL_ROOT}\"); %>" > "/usr/local/tomcat/webapps/source/index.jsp"
 fi
 
 indexer(){
 	# Wait for Tomcat startup.
 	date +"%F %T Waiting for Tomcat startup..."
-	while [ "`curl --silent --write-out '%{response_code}' -o /dev/null 'http://localhost:8080/${OPENGROK_WEBAPP_CONTEXT#/}'`" == "000" ]; do
+	while [ "`curl --silent --write-out '%{response_code}' -o /dev/null 'http://localhost:8080/${URL_ROOT}'`" == "000" ]; do
 		sleep 1;
 	done
 	date +"%F %T Startup finished"