From 859b87fadd938e3c8b361c80139e4af5a48efb81 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sun, 15 Oct 2023 20:21:44 -0400
Subject: [PATCH] fix: remove more references to ubuntu bionic

---
 bootstrap.sh                                            | 8 ++++----
 contrib/images/digitalocean/in_parts/012-dokku-packages | 2 +-
 contrib/release-dokku                                   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index d5de53341..df024a533 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -185,16 +185,16 @@ install-dokku-from-deb-package() {
     wget -nv -O - https://get.docker.com/ | sh
   fi
 
-  OS_ID="$(lsb_release -cs 2>/dev/null || echo "bionic")"
+  OS_ID="$(lsb_release -cs 2>/dev/null || echo "jammy")"
   if ! in-array "$DOKKU_DISTRO" "debian" "ubuntu" "raspbian"; then
     DOKKU_DISTRO="ubuntu"
-    OS_ID="bionic"
+    OS_ID="jammy"
   fi
 
   if [[ "$DOKKU_DISTRO" == "ubuntu" ]]; then
-    OS_IDS=("bionic" "focal" "jammy")
+    OS_IDS=("focal" "jammy")
     if ! in-array "$OS_ID" "${OS_IDS[@]}"; then
-      OS_ID="bionic"
+      OS_ID="jammy"
     fi
   elif [[ "$DOKKU_DISTRO" == "debian" ]]; then
     OS_IDS=("stretch" "buster" "bullseye" "bookworm")
diff --git a/contrib/images/digitalocean/in_parts/012-dokku-packages b/contrib/images/digitalocean/in_parts/012-dokku-packages
index 198e0fd88..67fde1149 100755
--- a/contrib/images/digitalocean/in_parts/012-dokku-packages
+++ b/contrib/images/digitalocean/in_parts/012-dokku-packages
@@ -50,7 +50,7 @@ echo '--> Setting up dokku apt repository'
 curl -fsSL https://packagecloud.io/dokku/dokku/gpgkey -o /etc/apt/keyrings/dokku.asc
 
 cat >/etc/apt/sources.list.d/dokku.list <<EOM
-deb [arch=amd64 signed-by=/etc/apt/keyrings/dokku.asc]  https://packagecloud.io/dokku/dokku/ubuntu/ bionic main
+deb [arch=amd64 signed-by=/etc/apt/keyrings/dokku.asc]  https://packagecloud.io/dokku/dokku/ubuntu/ jammy main
 EOM
 
 echo '--> Install dependencies for dokku from new repository'
diff --git a/contrib/release-dokku b/contrib/release-dokku
index c63fdc8eb..fc5de35c1 100755
--- a/contrib/release-dokku
+++ b/contrib/release-dokku
@@ -144,7 +144,7 @@ fn-publish-package() {
       fi
     done
   elif [[ "$DIST" == "ubuntu" ]]; then
-    OS_IDS=("bionic" "focal" "jammy")
+    OS_IDS=("focal" "jammy")
     for OS_ID in "${OS_IDS[@]}"; do
       log-info "(release-dokku) pushing ${RELEASE_TYPE} to packagecloud.com/${REPOSITORY}/${DIST}"
       package_cloud push "${REPOSITORY}/${DIST}/${OS_ID}" "$PACKAGE_NAME"