From 9278788bee224a99290668fc1b01181ed090be9b Mon Sep 17 00:00:00 2001 From: Christopher Hoskin Date: Mon, 22 Apr 2024 10:01:37 +0100 Subject: [PATCH] Merge pull request #18028 from overleaf/csh-issue-18027-git-bridge-image Run git-bridge on an image which is supported going forward GitOrigin-RevId: be4d9ad5b8c11f206a9c5519fc016075c3114aff --- services/git-bridge/Dockerfile | 11 +++++------ services/git-bridge/start.sh | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/services/git-bridge/Dockerfile b/services/git-bridge/Dockerfile index b0b95ea8c3..a9acf7c621 100644 --- a/services/git-bridge/Dockerfile +++ b/services/git-bridge/Dockerfile @@ -1,6 +1,6 @@ # Dockerfile for git-bridge -FROM maven:3-jdk-11 as base +FROM maven:3-amazoncorretto-11-debian as base RUN apt-get update && apt-get install -y make git sqlite3 \ && rm -rf /var/lib/apt/lists @@ -23,19 +23,18 @@ RUN make package \ -name 'writelatex-git-bridge*jar-with-dependencies.jar' \ -exec mv {} /git-bridge.jar \; -FROM openjdk:11-jre +FROM amazoncorretto:11-alpine -RUN apt-get update && apt-get install -y git sqlite3 procps htop net-tools sockstat libjemalloc2 \ - && rm -rf /var/lib/apt/lists +RUN apk add --update --no-cache git sqlite procps htop net-tools jemalloc -ENV LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.2 +ENV LD_PRELOAD=/usr/lib/libjemalloc.so.2 # Install Google Cloud Profiler agent RUN mkdir -p /opt/cprof && \ wget -q -O- https://storage.googleapis.com/cloud-profiler/java/latest/profiler_java_agent.tar.gz \ | tar xzv -C /opt/cprof -RUN useradd --create-home node +RUN adduser -D node COPY --from=builder /git-bridge.jar / diff --git a/services/git-bridge/start.sh b/services/git-bridge/start.sh index 6f1f6fba76..6f6ce3ad78 100755 --- a/services/git-bridge/start.sh +++ b/services/git-bridge/start.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh /opt/envsubst < /envsubst_template.json > /conf/runtime.json