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

2
lib/docker-compose.git-bridge.yml
View file

@ -11,7 +11,7 @@ services:
expose:
- "8000"
environment:
GIT_BRIDGE_API_BASE_URL: "http://sharelatex/api/v0"
GIT_BRIDGE_API_BASE_URL: "${GIT_BRIDGE_API_BASE_URL}"
GIT_BRIDGE_OAUTH2_SERVER: "http://sharelatex"
GIT_BRIDGE_POSTBACK_BASE_URL: "http://git-bridge:8000"
GIT_BRIDGE_ROOT_DIR: "/data/git-bridge"

3
lib/shared-functions.sh
View file

@ -10,9 +10,10 @@ function read_config() {
function read_image_version() {
IMAGE_VERSION="$(head -n 1 "$TOOLKIT_ROOT/config/version")"
if [[ ! "$IMAGE_VERSION" =~ ^([0-9]+)\.[0-9]+\.[0-9]+(-RC[0-9]*)?(-with-texlive-full)?$ ]]; then
if [[ ! "$IMAGE_VERSION" =~ ^([0-9]+)\.([0-9]+)\.[0-9]+(-RC[0-9]*)?(-with-texlive-full)?$ ]]; then
echo "ERROR: invalid version '${IMAGE_VERSION}'"
exit 1
fi
IMAGE_VERSION_MAJOR=${BASH_REMATCH[1]}
IMAGE_VERSION_MINOR=${BASH_REMATCH[2]}
}