From e02db459c68cd65b2084a58f3d32678d4b56e4cd Mon Sep 17 00:00:00 2001
From: Jakob Ackermann <jakob.ackermann@overleaf.com>
Date: Wed, 23 Oct 2024 12:21:41 +0100
Subject: [PATCH] Append version to GIT_BRIDGE_IMAGE

---
 CHANGELOG.md       | 10 ++++++++++
 bin/docker-compose |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a93f9e..de0f0bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## 2024-10-23
+### Changed
+- If set, the `overleaf.rc` entry `GIT_BRIDGE_IMAGE` must be specified without the version now.
+
+  Example:
+  ```diff
+  -GIT_BRIDGE_IMAGE=my.registry.com/overleaf/git-bridge:5.1.1
+  +GIT_BRIDGE_IMAGE=my.registry.com/overleaf/git-bridge
+  ```
+
 ## 2024-09-24
 ### Added
 - Print warning when running `bin/up` without detach mode
diff --git a/bin/docker-compose b/bin/docker-compose
index e7ccb49..d3f27d6 100755
--- a/bin/docker-compose
+++ b/bin/docker-compose
@@ -206,7 +206,7 @@ function set_nginx_vars() {
 function set_git_bridge_vars() {
   local image_name
   if [[ -n ${GIT_BRIDGE_IMAGE:-} ]]; then
-    image_name="$GIT_BRIDGE_IMAGE"
+    image_name="$GIT_BRIDGE_IMAGE:$IMAGE_VERSION"
   else
     image_name="quay.io/sharelatex/git-bridge:$IMAGE_VERSION"
   fi