瀏覽代碼

Merge pull request #18312 from overleaf/gs-git-bridge-bash

Install bash in git-bridge Docker image

GitOrigin-RevId: 2ed599c3c2a3a1c3e66845d4d17d6ac36d925d70
Gernot Schulz 2 年之前
父節點
當前提交
e8fe5abc82
共有 2 個文件被更改,包括 3 次插入3 次删除
  1. 1 1
      services/git-bridge/Dockerfile
  2. 2 2
      services/git-bridge/start.sh

+ 1 - 1
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
 

+ 2 - 2
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