From fd324bd57ff22e23983e597a98de3bf7398a9e9b Mon Sep 17 00:00:00 2001
From: Gerrod Ubben <gerrodubben@gmail.com>
Date: Thu, 31 Oct 2024 10:59:46 -0400
Subject: [PATCH] Upgrade CI ubuntu version for build support

---
 .github/actions/build_image/action.yml | 4 ++++
 .github/workflows/ci.yml               | 2 +-
 .github/workflows/release.yml          | 2 +-
 images/pulp/stable/Containerfile       | 1 +
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/actions/build_image/action.yml b/.github/actions/build_image/action.yml
index de2816bb..43dbaef1 100644
--- a/.github/actions/build_image/action.yml
+++ b/.github/actions/build_image/action.yml
@@ -38,6 +38,10 @@ runs:
       run: pip install httpie jq
       shell: bash
 
+    - name: Update podman/buildah
+      run: sudo apt-get -y update && sudo apt-get -y dist-upgrade podman buildah
+      shell: bash
+
     - name: Restore podman images from cache
       uses: actions/cache/restore@v3
       with:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 29c2a321..9e7c4d45 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -62,7 +62,7 @@ jobs:
 
   app-images:
     needs: base-images
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     outputs:
       app_version: ${{ steps.build_image.outputs.app_version }}
       app_branch: ${{ steps.build_image.outputs.app_branch }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b9e91031..272d7be6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -153,7 +153,7 @@ jobs:
 
   app-images:
     needs: base-images
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     outputs:
       app_version: ${{ steps.build_image.outputs.app_version }}
       app_branch: ${{ steps.build_image.outputs.app_branch }}
diff --git a/images/pulp/stable/Containerfile b/images/pulp/stable/Containerfile
index e22cdf3d..8ad6a670 100644
--- a/images/pulp/stable/Containerfile
+++ b/images/pulp/stable/Containerfile
@@ -42,6 +42,7 @@ RUN ln $(pip3 show pulp_ansible | sed -n -e 's/Location: //p')/pulp_ansible/app/
 RUN ln $(pip3 show pulp_container | sed -n -e 's/Location: //p')/pulp_container/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_container.conf
 RUN ln $(pip3 show pulp_python | sed -n -e 's/Location: //p')/pulp_python/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_python.conf
 
+# heredocs support requires buildkit >=0.10 or buildah >=1.33
 RUN <<EOF
   if [[ "$PULP_UI_URL" ]]; then
     mkdir -p "${PULP_STATIC_ROOT}pulp_ui"