mirrors/overleaf-toolkit
1
0
Fork 0
mirror of https://github.com/overleaf/toolkit.git synced 2025-04-19 07:18:06 +02:00
Code Activity

Use web-api for git-bridge in Server Pro 4.2.0 onwards

Browse source
This commit is contained in:
Jakob Ackermann 2023-09-15 12:27:38 +01:00
parent c5c761e032
commit 2ec1e682a1
No known key found for this signature in database
GPG key ID: 30C56800FCA3828A
4 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
bin/docker-compose
View file

@ -77,6 +77,13 @@ function set_base_vars() {
GIT_BRIDGE_ENABLED=false
fi
HAS_WEB_API=false
if [[ $IMAGE_VERSION_MAJOR -gt 4 ]]; then
HAS_WEB_API=true
elif [[ $IMAGE_VERSION_MAJOR == 4 && $IMAGE_VERSION_MINOR -ge 2 ]]; then
HAS_WEB_API=true
fi
export GIT_BRIDGE_ENABLED
export MONGO_URL
export REDIS_HOST
@ -146,7 +153,14 @@ function set_git_bridge_vars() {
else
image_name="quay.io/sharelatex/git-bridge:$IMAGE_VERSION"
fi
GIT_BRIDGE_API_BASE_URL="http://sharelatex/api/v0/"
if [[ $HAS_WEB_API == "true" ]]; then
GIT_BRIDGE_API_BASE_URL="http://sharelatex:3000/api/v0/"
fi
DOCKER_COMPOSE_FLAGS+=(-f "$TOOLKIT_ROOT/lib/docker-compose.git-bridge.yml")
export GIT_BRIDGE_API_BASE_URL
export GIT_BRIDGE_IMAGE=${image_name}
export GIT_BRIDGE_DATA_PATH
export GIT_BRIDGE_LOG_LEVEL