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

Check Server Pro version before starting git bridge

Browse source
This commit is contained in:
Eric Mc Sween 2023-04-03 12:06:12 -04:00
parent 19ee1e19b7
commit 5971ffc5d4
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
bin/docker-compose
View file

@ -18,11 +18,11 @@ fi
function __main__() {
local IMAGE_VERSION
IMAGE_VERSION="$(head -n 1 "$TOOLKIT_ROOT/config/version")"
if [[ ! "$IMAGE_VERSION" \
=~ ^[0-9]+\.[0-9]+\.[0-9]+(-RC)?$ ]]; then
if [[ ! "$IMAGE_VERSION" =~ ^([0-9]+)\.[0-9]+\.[0-9]+(-RC)?$ ]]; then
echo "ERROR: invalid version '${IMAGE_VERSION}'"
exit 1
fi
local IMAGE_VERSION_MAJOR=${BASH_REMATCH[1]}
# Load vars from the rc file
read_config
@ -41,9 +41,14 @@ function __main__() {
if [[ "${NGINX_ENABLED}" == "true" ]]; then
compose_file_flags+=("-f $TOOLKIT_ROOT/lib/docker-compose.nginx.yml")
fi
if [[ "${GIT_BRIDGE_ENABLED}" == "true" ]]; then
compose_file_flags+=("-f $TOOLKIT_ROOT/lib/docker-compose.git-bridge.yml")
GIT_BRIDGE_IMAGE="quay.io/sharelatex/git-bridge:$IMAGE_VERSION"
if [[ $GIT_BRIDGE_ENABLED = "true" ]]; then
if [[ $SERVER_PRO = "true" && $IMAGE_VERSION_MAJOR -ge 4 ]]; then
compose_file_flags+=("-f $TOOLKIT_ROOT/lib/docker-compose.git-bridge.yml")
GIT_BRIDGE_IMAGE="quay.io/sharelatex/git-bridge:$IMAGE_VERSION"
else
# Git bridge is only supported in Server Pro 4+
GIT_BRIDGE_ENABLED=false
fi
fi
# Include docker-compose.override.yml if it is present