From 182da2e12e579b34f54ae64b81cc6518614036eb Mon Sep 17 00:00:00 2001
From: David O'Sullivan <davidos@vmware.com>
Date: Tue, 18 Apr 2023 13:35:49 +0100
Subject: [PATCH 1/2] Updates dockerfile to build with Jammy

---
 ci/Dockerfile | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/ci/Dockerfile b/ci/Dockerfile
index d4ee0c6d55..35f2201381 100644
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -1,15 +1,13 @@
-ARG base_image=ubuntu:bionic
+ARG base_image=ubuntu:jammy
 FROM ${base_image}
 
 RUN apt-get update && apt-get install -y \
     build-essential \
     curl \
     git \
-    libssl1.0-dev \
+    libssl-dev \
     libreadline-dev \
-    lsb-release \
     locales \
-    python \
     zip \
     zlib1g-dev \
  && apt-get clean \
@@ -28,12 +26,6 @@ RUN eval "$(rbenv init -)" \
  && git clone https://github.com/sstephenson/rbenv-default-gems.git $(rbenv root)/plugins/rbenv-default-gems \
  && echo 'bundler 2.3.26' >> $(rbenv root)/default-gems
 
-RUN eval "$(rbenv init -)" \
- && rbenv install 2.5.9
-
-RUN eval "$(rbenv init -)" \
- && rbenv install 2.7.6
-
 RUN eval "$(rbenv init -)" \
  && rbenv install 3.0.4
 

From 60ca32eb25c826fc1d6c6d524df554dab653ced4 Mon Sep 17 00:00:00 2001
From: David O'Sullivan
 <31728678+pivotal-david-osullivan@users.noreply.github.com>
Date: Wed, 31 Jul 2024 17:29:58 +0100
Subject: [PATCH 2/2] Update Dockerfile

---
 ci/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci/Dockerfile b/ci/Dockerfile
index 35f2201381..64401a629d 100644
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -10,6 +10,7 @@ RUN apt-get update && apt-get install -y \
     locales \
     zip \
     zlib1g-dev \
+    openjdk-17-jdk \
  && apt-get clean \
  && rm -rf /var/lib/apt/lists/*