From e8fe5abc8275dd8d2dbde10efb9ab6c59fcfc21d Mon Sep 17 00:00:00 2001
From: Gernot Schulz <gernot.schulz@overleaf.com>
Date: Fri, 17 May 2024 09:52:09 +0200
Subject: [PATCH] Merge pull request #18312 from overleaf/gs-git-bridge-bash

Install bash in git-bridge Docker image

GitOrigin-RevId: 2ed599c3c2a3a1c3e66845d4d17d6ac36d925d70
---
 services/git-bridge/Dockerfile | 2 +-
 services/git-bridge/start.sh   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/git-bridge/Dockerfile b/services/git-bridge/Dockerfile
index a9acf7c621..f7407b09ab 100644
--- a/services/git-bridge/Dockerfile
+++ b/services/git-bridge/Dockerfile
@@ -25,7 +25,7 @@ RUN make package \
 
 FROM amazoncorretto:11-alpine
 
-RUN apk add --update --no-cache git sqlite procps htop net-tools jemalloc
+RUN apk add --update --no-cache bash git sqlite procps htop net-tools jemalloc
 
 ENV LD_PRELOAD=/usr/lib/libjemalloc.so.2
 
diff --git a/services/git-bridge/start.sh b/services/git-bridge/start.sh
index 6f6ce3ad78..714eeba14b 100755
--- a/services/git-bridge/start.sh
+++ b/services/git-bridge/start.sh
@@ -4,11 +4,11 @@
 
 VERSION=$(date +%y%m%d%H%M%S)
 
-if [ "x$GIT_BRIDGE_JVM_ARGS" == "x" ]; then
+if [ -z "$GIT_BRIDGE_JVM_ARGS" ]; then
   GIT_BRIDGE_JVM_ARGS="-XX:+UseContainerSupport -XX:MaxRAMPercentage=50.0"
 fi
 
-if [ "$ENABLE_PROFILE_AGENT" == "true" ]; then
+if [ "$ENABLE_PROFILE_AGENT" = "true" ]; then
   GIT_BRIDGE_JVM_ARGS="-agentpath:/opt/cprof/profiler_java_agent.so=-cprof_service=git-bridge,-cprof_service_version=${VERSION},-cprof_enable_heap_sampling=true ${GIT_BRIDGE_JVM_ARGS}"
 fi