From 341e442b63b15958fd59348b5e1ca70230d81122 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Tue, 4 Jun 2024 20:38:31 +0900
Subject: [PATCH 1/3] Retired bionic

---
 .github/workflows/build.yml |  1 -
 .github/workflows/test.yml  |  1 -
 Dockerfile                  | 15 ---------------
 Rakefile                    |  4 +---
 4 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7043c17..32eb645 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -37,7 +37,6 @@ jobs:
           - noble
           - jammy
           - focal
-          - bionic
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ead10e9..0263089 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,7 +15,6 @@ jobs:
           - noble
           - jammy
           - focal
-          - bionic
         ruby_version:
           - 3.0.7
           - 3.1.6
diff --git a/Dockerfile b/Dockerfile
index 7b145b8..efcd553 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,13 +13,6 @@ ENV DEBIAN_FRONTEND noninteractive
 
 RUN set -ex && \
     apt-get update && \
-    \
-    if test "x$BASE_IMAGE_TAG" = "xbionic"; then \
-        apt-get install -y --no-install-recommends \
-          software-properties-common && \
-        apt-add-repository ppa:git-core/ppa; \
-    fi && \
-    \
     apt-get install -y --no-install-recommends \
             autoconf \
             bison \
@@ -80,14 +73,6 @@ ENV DEBIAN_FRONTEND noninteractive
 
 RUN set -ex && \
     apt-get update && \
-    \
-    if test "x$BASE_IMAGE_TAG" = "xbionic"; then \
-        apt-get install -y --no-install-recommends \
-                software-properties-common \
-                && \
-        apt-add-repository ppa:git-core/ppa; \
-    fi && \
-    \
     apt-get install -y --no-install-recommends \
             ca-certificates \
             libffi-dev \
diff --git a/Rakefile b/Rakefile
index dc05cfe..9603281 100644
--- a/Rakefile
+++ b/Rakefile
@@ -19,9 +19,7 @@ def download(url)
 end
 
 def default_ubuntu_version(ruby_version)
-  if ruby_version < "3.0"
-    "bionic"
-  elsif ruby_version < "3.1"
+  if ruby_version < "3.1"
     "focal"
   else
     "jammy"

From b9a45b6b3c61bd27f00cec0629299a5eff41b88e Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Tue, 4 Jun 2024 20:39:03 +0900
Subject: [PATCH 2/3] Don't build Ruby 3.0

---
 .github/workflows/test.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0263089..f2428dc 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,7 +16,6 @@ jobs:
           - jammy
           - focal
         ruby_version:
-          - 3.0.7
           - 3.1.6
           - 3.2.4
           - 3.3.2

From b67f155338f2e0cd4abe06f81964349f9f298bdc Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Tue, 4 Jun 2024 20:46:39 +0900
Subject: [PATCH 3/3] Use jammy instead of bionic

---
 README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 21a608f..d13f713 100644
--- a/README.md
+++ b/README.md
@@ -56,12 +56,12 @@ The list of image names in this repository is below:
 
 We have some other images for special purposes.
 
-- Preview or Release-candidate versions (e.g. `rubylang/ruby:2.7.0-preview1-bionic`)
-- Nightly built master (e.g. `rubylang/ruby:master-nightly-bionic`)
-- Nightly debug built master (e.g. `rubylang/ruby:master-debug-nightly-bionic`)
-- EOL versions (e.g. `rubylang/ruby:2.4.10-bionic`)
+- Preview or Release-candidate versions (e.g. `rubylang/ruby:2.7.0-preview1-jammy`)
+- Nightly built master (e.g. `rubylang/ruby:master-nightly-jammy`)
+- Nightly debug built master (e.g. `rubylang/ruby:master-debug-nightly-jammy`)
+- EOL versions (e.g. `rubylang/ruby:2.4.10-jammy`)
 
-All the images are based on `ubuntu:bionic`, and made from just doing `make install` and installing bundler.
+All the images are based on `ubuntu:jammy`, and made from just doing `make install` and installing bundler.
 
 ## How to build images