Upgrade git version in ubuntu 20.04 image (#7056)

buildbuddy-io · Jul 19, 2024 · 2bb02fe · 2bb02fe
1 parent dcd5519
commit 2bb02fe
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/dockerfiles/rbe-ubuntu20-04/Dockerfile b/dockerfiles/rbe-ubuntu20-04/Dockerfile
@@ -31,6 +31,11 @@ RUN apt-get update && \
 
 # Misc. utils
 RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+      software-properties-common \
+      && \
+    add-apt-repository ppa:git-core/ppa && \
+    apt-get update && \
     apt-get install -y --no-install-recommends \
       ed \
       curl \

diff --git a/enterprise/dockerfiles/rbe-ubuntu20-04-workflows/Dockerfile b/enterprise/dockerfiles/rbe-ubuntu20-04-workflows/Dockerfile
@@ -1,4 +1,4 @@
-FROM gcr.io/flame-public/rbe-ubuntu20-04@sha256:036ae8c90876fa22da9ace6f8218e614f4cd500a154fc162973fff691e72d28e
+FROM gcr.io/flame-public/rbe-ubuntu20-04@sha256:09261f2019e9baa7482f7742cdee8e9972a3971b08af27363a61816b2968f622
 
 # Install bazelisk
 RUN curl -Lo /usr/local/bin/bazelisk https://github.com/bazelbuild/bazelisk/releases/download/v1.15.0/bazelisk-linux-amd64 && \

diff --git a/enterprise/server/remote_execution/platform/platform.go b/enterprise/server/remote_execution/platform/platform.go
@@ -39,10 +39,10 @@ var (
 
 const (
 	Ubuntu16_04Image = "gcr.io/flame-public/executor-docker-default:enterprise-v1.6.0"
-	Ubuntu20_04Image = "gcr.io/flame-public/rbe-ubuntu20-04@sha256:036ae8c90876fa22da9ace6f8218e614f4cd500a154fc162973fff691e72d28e"
+	Ubuntu20_04Image = "gcr.io/flame-public/rbe-ubuntu20-04@sha256:09261f2019e9baa7482f7742cdee8e9972a3971b08af27363a61816b2968f622"
 
 	Ubuntu18_04WorkflowsImage = "gcr.io/flame-public/buildbuddy-ci-runner@sha256:8cf614fc4695789bea8321446402e7d6f84f6be09b8d39ec93caa508fa3e3cfc"
-	Ubuntu20_04WorkflowsImage = "gcr.io/flame-public/rbe-ubuntu20-04-workflows@sha256:271e5e3704d861159c75b8dd6713dbe5a12272ec8ee73d17f89ed7be8026553f"
+	Ubuntu20_04WorkflowsImage = "gcr.io/flame-public/rbe-ubuntu20-04-workflows@sha256:c5092c8cb94471bb7c7fbd046cd80cb596dcc508f0833a748c035a1ba41f1681"
 
 	Ubuntu20_04GitHubActionsImage = "gcr.io/flame-public/rbe-ubuntu20-04-github-actions@sha256:2a3b50fa1aafcb8446c94ab5707270f92fa91abd64a0e049312d4a086d0abb1c"