Rebrand variables for bin/docker-compose

Updates docker-compose.base.yml and sibling containers
base file with the changes in the script

bin/docker-compose

@@ -45,7 +45,7 @@ function build_environment() {
 }
 
 function canonicalize_data_paths() {
-  SHARELATEX_DATA_PATH=$(cd "$TOOLKIT_ROOT"; realpath "$SHARELATEX_DATA_PATH")
+  OVERLEAF_DATA_PATH=$(cd "$TOOLKIT_ROOT"; realpath "$OVERLEAF_DATA_PATH")
   MONGO_DATA_PATH=$(cd "$TOOLKIT_ROOT"; realpath "$MONGO_DATA_PATH")
   REDIS_DATA_PATH=$(cd "$TOOLKIT_ROOT"; realpath "$REDIS_DATA_PATH")
   GIT_BRIDGE_DATA_PATH=$(cd "$TOOLKIT_ROOT"; realpath "$GIT_BRIDGE_DATA_PATH")
@@ -56,8 +56,8 @@ function set_base_vars() {
   DOCKER_COMPOSE_FLAGS=(-f "$TOOLKIT_ROOT/lib/docker-compose.base.yml")
 
   local image_name
-  if [[ -n ${SHARELATEX_IMAGE_NAME:-} ]]; then
-    image_name="$SHARELATEX_IMAGE_NAME"
+  if [[ -n ${OVERLEAF_IMAGE_NAME:-} ]]; then
+    image_name="$OVERLEAF_IMAGE_NAME"
   elif [[ $SERVER_PRO == "true" ]]; then
     image_name="quay.io/sharelatex/sharelatex-pro"
   else
@@ -65,12 +65,14 @@ function set_base_vars() {
   fi
   export IMAGE="$image_name:$IMAGE_VERSION"
 
-  if [[ ${SHARELATEX_LISTEN_IP:-null} == "null" ]];
+  OVERLEAF_LISTEN_IP=${OVERLEAF_LISTEN_IP:-${SHARELATEX_LISTEN_IP:-}}
+  if [[ ${OVERLEAF_LISTEN_IP:-null} == "null" ]];
   then
-    echo "WARNING: the value of SHARELATEX_LISTEN_IP is not set in config/overleaf.rc. This value must be set to the public IP address for direct container access. Defaulting to 0.0.0.0" >&2
-    SHARELATEX_LISTEN_IP="0.0.0.0"
+    echo "WARNING: the value of OVERLEAF_LISTEN_IP is not set in config/overleaf.rc. This value must be set to the public IP address for direct container access. Defaulting to 0.0.0.0" >&2
+    OVERLEAF_LISTEN_IP="0.0.0.0"
   fi
-  export SHARELATEX_LISTEN_IP
+  export OVERLEAF_LISTEN_IP
+  OVERLEAF_PORT=${OVERLEAF_PORT:-${SHARELATEX_PORT:-}}
 
   if [[ $SERVER_PRO != "true" || $IMAGE_VERSION_MAJOR -lt 4 ]]; then
     # Force git bridge to be disabled if not ServerPro >= 4
@@ -84,12 +86,25 @@ function set_base_vars() {
     HAS_WEB_API=true
   fi
 
+  OVERLEAF_IN_CONTAINER_DATA_PATH=/var/lib/overleaf
+  MONGO_URL_KEY=OVERLEAF_MONGO_URL
+  REDIS_HOST_KEY=OVERLEAF_REDIS_HOST
+  if [[ "$IMAGE_VERSION_MAJOR" -lt 5 ]]; then
+    OVERLEAF_IN_CONTAINER_DATA_PATH=/var/lib/sharelatex
+    MONGO_URL_KEY=SHARELATEX_MONGO_URL
+    REDIS_HOST_KEY=SHARELATEX_REDIS_HOST
+  fi
+
   export GIT_BRIDGE_ENABLED
   export MONGO_URL
+  export MONGO_URL_KEY
   export REDIS_HOST
+  export REDIS_HOST_KEY
   export REDIS_PORT
-  export SHARELATEX_DATA_PATH
-  export SHARELATEX_PORT
+  export OVERLEAF_DATA_PATH
+  export OVERLEAF_PORT
+  export OVERLEAF_IN_CONTAINER_DATA_PATH
+
 }
 
 # Set environment variables for docker-compose.redis.yml
@@ -118,7 +133,7 @@ function set_mongo_vars() {
 function set_sibling_containers_vars() {
   DOCKER_COMPOSE_FLAGS+=(-f "$TOOLKIT_ROOT/lib/docker-compose.sibling-containers.yml")
   export DOCKER_SOCKET_PATH
-  export SHARELATEX_DATA_PATH
+  export OVERLEAF_DATA_PATH
 }
 
 # Set environment variables for docker-compose.nginx.yml

lib/default.rc

@@ -2,8 +2,8 @@
 
 PROJECT_NAME=overleaf
 SERVER_PRO=false
-SHARELATEX_DATA_PATH=data/sharelatex
-SHARELATEX_PORT=80
+OVERLEAF_DATA_PATH=data/sharelatex
+OVERLEAF_PORT=80
 
 # Sibling containers
 SIBLING_CONTAINERS_ENABLED=false

lib/docker-compose.base.yml

@@ -7,17 +7,19 @@ services:
         image: "${IMAGE}"
         container_name: sharelatex
         volumes:
-            - "${SHARELATEX_DATA_PATH}:/var/lib/sharelatex"
+            - "${OVERLEAF_DATA_PATH}:${OVERLEAF_IN_CONTAINER_DATA_PATH}"
         ports:
-            - "${SHARELATEX_LISTEN_IP:-127.0.0.1}:${SHARELATEX_PORT:-80}:80"
+            - "${OVERLEAF_LISTEN_IP:-127.0.0.1}:${OVERLEAF_PORT:-80}:80"
         environment:
           GIT_BRIDGE_ENABLED: "${GIT_BRIDGE_ENABLED}"
           GIT_BRIDGE_HOST: "git-bridge"
           GIT_BRIDGE_PORT: "8000"
           REDIS_HOST: "${REDIS_HOST}"
           REDIS_PORT: "${REDIS_PORT}"
-          SHARELATEX_MONGO_URL: "${MONGO_URL}"
-          SHARELATEX_REDIS_HOST: "${REDIS_HOST}"
+          OVERLEAF_MONGO_URL: "${MONGO_URL}"
+          OVERLEAF_REDIS_HOST: "${REDIS_HOST}"
+          ${MONGO_URL_KEY}: "${MONGO_URL}"
+          ${REDIS_HOST_KEY}: "${REDIS_HOST}"
           V1_HISTORY_URL: "http://sharelatex:3100/api"
         env_file:
             - ../config/variables.env

lib/docker-compose.sibling-containers.yml

@@ -8,5 +8,5 @@ services:
       DOCKER_RUNNER: 'true'
       SANDBOXED_COMPILES: 'true'
       SANDBOXED_COMPILES_SIBLING_CONTAINERS: 'true'
-      SANDBOXED_COMPILES_HOST_DIR: "${SHARELATEX_DATA_PATH}/data/compiles"
-      SYNCTEX_BIN_HOST_PATH: "${SHARELATEX_DATA_PATH}/bin/synctex"
+      SANDBOXED_COMPILES_HOST_DIR: "${OVERLEAF_DATA_PATH}/data/compiles"
+      SYNCTEX_BIN_HOST_PATH: "${OVERLEAF_DATA_PATH}/bin/synctex"