Upgrade CI ubuntu version for build support

pulp · Oct 31, 2024 · b870942 · b870942
1 parent b12c0ac
commit b870942
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git 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 buildah
+      run: sudo apt-get -y install buildah==1.37
+      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
@@ -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
@@ -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
@@ -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"