Configurable 'GIT_BRIDGE_IMAGE' and 'GIT_BRIDGE_LOG_LEVEL'

bin/docker-compose

@@ -140,9 +140,16 @@ function set_nginx_vars() {
 
 # Set environment variables for docker-compose.git-bridge.yml
 function set_git_bridge_vars() {
+  local image_name
+  if [[ -n ${GIT_BRIDGE_IMAGE:-} ]]; then
+    image_name="$GIT_BRIDGE_IMAGE"
+  else
+    image_name="quay.io/sharelatex/git-bridge:$IMAGE_VERSION"
+  fi
   DOCKER_COMPOSE_FLAGS+=(-f "$TOOLKIT_ROOT/lib/docker-compose.git-bridge.yml")
-  export GIT_BRIDGE_IMAGE="quay.io/sharelatex/git-bridge:$IMAGE_VERSION"
+  export GIT_BRIDGE_IMAGE=${image_name}
   export GIT_BRIDGE_DATA_PATH
+  export GIT_BRIDGE_LOG_LEVEL
 }
 
 function print_debug_info() {

lib/default.rc

@@ -24,6 +24,7 @@ REDIS_DATA_PATH=data/redis
 # Git bridge configuration
 GIT_BRIDGE_ENABLED=false
 GIT_BRIDGE_DATA_PATH=data/git-bridge
+GIT_BRIDGE_LOG_LEVEL=INFO
 
 # TLS proxy configuration
 NGINX_ENABLED=false

lib/docker-compose.git-bridge.yml

@@ -15,6 +15,7 @@ services:
             GIT_BRIDGE_OAUTH2_SERVER: "http://sharelatex"
             GIT_BRIDGE_POSTBACK_BASE_URL: "http://git-bridge:8000"
             GIT_BRIDGE_ROOT_DIR: "/data/git-bridge"
+            LOG_LEVEL: "${GIT_BRIDGE_LOG_LEVEL}"
         env_file:
             - ../config/variables.env
         user: root