Merge pull request #312 from rhusar/containerfile

CI: Standardize on 'Containerfile' naming and Upgrade to Fedora 41
modcluster · Jan 10, 2025 · 9924833 · 9924833
2 parents ffc8aac + a107bb5
commit 9924833
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,6 +13,7 @@ on:
 jobs:
 
   cmake-fedora-latest:
+    name: cmake-fedora-latest
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -30,17 +31,15 @@ jobs:
       - name: Create container and build
         run: |
           {
-              echo 'FROM fedora:40'
-              echo 'RUN dnf install cmake httpd-devel ${{ matrix.compiler }} -y'
-              echo 'RUN dnf groupinstall "C Development Tools and Libraries" -y'
+              echo 'FROM fedora:41'
+              echo 'RUN dnf install --assumeyes @c-development cmake httpd-devel ${{ matrix.compiler }}'
               echo 'RUN dnf clean all'
               echo 'COPY mod_proxy_cluster mod_proxy_cluster'
               echo 'WORKDIR /mod_proxy_cluster/native'
               echo 'RUN cmake . -DCMAKE_C_COMPILER=${{ matrix.compiler }}'
               echo 'RUN make'
-          } > podmanfile
-          podman build -f ./podmanfile
-    name: cmake-fedora-latest
+          } > Containerfile
+          podman build .
 
   make-fedora-latest:
     runs-on: ubuntu-latest
@@ -56,9 +55,8 @@ jobs:
       - name: Create container and build
         run: |
           {
-              echo 'FROM fedora:40'
-              echo 'RUN dnf install httpd-devel redhat-rpm-config -y'
-              echo 'RUN dnf groupinstall "C Development Tools and Libraries" -y'
+              echo 'FROM fedora:41'
+              echo 'RUN dnf install --assumeyes @c-development httpd-devel redhat-rpm-config'
               echo 'RUN dnf clean all'
               echo 'COPY mod_proxy_cluster mod_proxy_cluster'
               echo 'WORKDIR /mod_proxy_cluster/native'
@@ -73,8 +71,8 @@ jobs:
               echo '  make || exit 1; \'
               echo '  cd ..; \'
               echo 'done;'
-          } > podmanfile
-          podman build -f ./podmanfile
+          } > Containerfile
+          podman build .
 
   clang-format-style-check:
     runs-on: ubuntu-latest